Version 1.0.2 dist files.

filamentgroup · Jan 27, 2015 · 04bd837 · 04bd837
1 parent 6cc664c
commit 04bd837
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/dist/bare/tablesaw.bare.css b/dist/bare/tablesaw.bare.css
@@ -1,4 +1,4 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 

diff --git a/dist/stackonly/tablesaw.stackonly.css b/dist/stackonly/tablesaw.stackonly.css
@@ -1,4 +1,4 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 

diff --git a/dist/stackonly/tablesaw.stackonly.js b/dist/stackonly/tablesaw.stackonly.js
@@ -1,4 +1,4 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 ;(function( $ ) {

diff --git a/dist/stackonly/tablesaw.stackonly.scss b/dist/stackonly/tablesaw.stackonly.scss
@@ -1,7 +1,7 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 

diff --git a/dist/tablesaw.css b/dist/tablesaw.css
@@ -1,4 +1,4 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 

diff --git a/dist/tablesaw.js b/dist/tablesaw.js
@@ -1,4 +1,4 @@
-/*! Tablesaw - v1.0.2 - 2015-01-26
+/*! Tablesaw - v1.0.2 - 2015-01-27
 * https://github.com/filamentgroup/tablesaw
 * Copyright (c) 2015 Filament Group; Licensed MIT */
 ;(function( $ ) {
@@ -562,11 +562,12 @@ if( !Tablesaw.config ) {
 		}
 
 		// Calculate initial widths
+		var initialWidth = $table.css( 'width' );
 		$table.css('width', 'auto');
 		$headerCells.each(function() {
 			headerWidths.push( $( this ).outerWidth() );
 		});
-		$table.css( 'width', '' );
+		$table.css( 'width', initialWidth );
 
 		$btns.appendTo( $table.prev( '.tablesaw-bar' ) );
 
@@ -669,7 +670,7 @@ if( !Tablesaw.config ) {
 			}
 
 			var extraPaddingPixels = 20,
-				containerWidth = $table.parent().width(),
+				tableWidth = $table.width(),
 				persist = [],
 				sum = 0,
 				sums = [],
@@ -685,7 +686,7 @@ if( !Tablesaw.config ) {
 				sums.push( sum );
 
 				// is persistent or is hidden
-				if( isPersist || sum > containerWidth ) {
+				if( isPersist || sum > tableWidth ) {
 					visibleNonPersistantCount--;
 				}
 			});
@@ -700,7 +701,7 @@ if( !Tablesaw.config ) {
 					return;
 				}
 
-				if( sums[ index ] <= containerWidth || needsNonPersistentColumn ) {
+				if( sums[ index ] <= tableWidth || needsNonPersistentColumn ) {
 					needsNonPersistentColumn = false;
 					showColumn( this );
 				} else {
@@ -1030,7 +1031,9 @@ if( !Tablesaw.config ) {
 					};
 
 				cells = getCells( rows );
-				fn = getSortFxn( ascending, $( col ).is( '[data-sortable-numeric]' ) );
+				var customFn = $( col ).data( 'tablesaw-sort' );
+				fn = ( customFn && typeof customFn === "function" ? customFn( ascending ) : false ) ||
+					getSortFxn( ascending, $( col ).is( '[data-sortable-numeric]' ) );
 				sorted = cells.sort( fn );
 				rows = applyToRows( sorted , rows );
 				return rows;