library-mirrors/tablesorter
1
0
Fork 0
mirror of https://github.com/Mottie/tablesorter.git synced 2025-01-12 15:24:21 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Core: Fix method of saving default widgetOptions. See #1356

Browse Source
This commit is contained in:
Rob Garrison 2017-03-14 16:53:46 -05:00
parent 3cd9882fc7
commit 0e2235fabc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/jquery.tablesorter.js
View File

@ -431,7 +431,7 @@
var tmp = $.extend( true, {}, c.originalSettings ); var tmp = $.extend( true, {}, c.originalSettings );
// restore original settings; this clears out current settings, but does not clear // restore original settings; this clears out current settings, but does not clear
// values saved to storage. // values saved to storage.
c = $.extend( true, ts.defaults, tmp ); c = $.extend( true, {}, ts.defaults, tmp );
c.originalSettings = tmp; c.originalSettings = tmp;
this.hasInitialized = false; this.hasInitialized = false;
// setup the entire table again // setup the entire table again
@ -1910,14 +1910,15 @@
}, },
applyWidgetOptions : function( table ) { applyWidgetOptions : function( table ) {
var indx, widget, var indx, widget, wo,
c = table.config, c = table.config,
len = c.widgets.length; len = c.widgets.length;
if ( len ) { if ( len ) {
for ( indx = 0; indx < len; indx++ ) { for ( indx = 0; indx < len; indx++ ) {
widget = ts.getWidgetById( c.widgets[ indx ] ); widget = ts.getWidgetById( c.widgets[ indx ] );
if ( widget && widget.options ) { if ( widget && widget.options ) {
c.widgetOptions = $.extend( true, widget.options, c.widgetOptions ); wo = $.extend( {}, widget.options );
c.widgetOptions = $.extend( true, wo, c.widgetOptions );
// add widgetOptions to defaults for option validator // add widgetOptions to defaults for option validator
$.extend( true, ts.defaults.widgetOptions, widget.options ); $.extend( true, ts.defaults.widgetOptions, widget.options );
} }