Browse Source

Only set properties that have changed

Dan Kaplun 10 years ago
parent
commit
1bfd4ba8b3

+ 3 - 5
dist/extensions/angular/bsTable.js

@@ -25,11 +25,9 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
             $el.bootstrapTable('destroy');
           }
           }
-          if (options) newOptions = $.extend({}, newOptions, {
-            sortName: options.sortName,
-            sortOrder: options.sortOrder,
-            pageNumber: options.pageNumber,
-            pageSize: options.pageSize
+          newOptions = angular.copy(newOptions);
+          if (options) angular.forEach(['sortName', 'sortOrder', 'pageNumber', 'pageSize'], function (key) {
+            if (key in options) newOptions[key] = options[key];
           });
           });
           options = newOptions;
           options = newOptions;
           $el.bootstrapTable(options);
           $el.bootstrapTable(options);

File diff suppressed because it is too large
+ 1 - 1
dist/extensions/angular/bsTable.min.js


+ 3 - 5
docs/dist/extensions/angular/bsTable.js

@@ -25,11 +25,9 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
             $el.bootstrapTable('destroy');
           }
           }
-          if (options) newOptions = $.extend({}, newOptions, {
-            sortName: options.sortName,
-            sortOrder: options.sortOrder,
-            pageNumber: options.pageNumber,
-            pageSize: options.pageSize
+          newOptions = angular.copy(newOptions);
+          if (options) angular.forEach(['sortName', 'sortOrder', 'pageNumber', 'pageSize'], function (key) {
+            if (key in options) newOptions[key] = options[key];
           });
           });
           options = newOptions;
           options = newOptions;
           $el.bootstrapTable(options);
           $el.bootstrapTable(options);

File diff suppressed because it is too large
+ 1 - 1
docs/dist/extensions/angular/bsTable.min.js


+ 3 - 5
src/extensions/angular/bsTable.js

@@ -25,11 +25,9 @@
             scroll = $el.bootstrapTable('getScrollPosition');
             scroll = $el.bootstrapTable('getScrollPosition');
             $el.bootstrapTable('destroy');
             $el.bootstrapTable('destroy');
           }
           }
-          if (options) newOptions = $.extend({}, newOptions, {
-            sortName: options.sortName,
-            sortOrder: options.sortOrder,
-            pageNumber: options.pageNumber,
-            pageSize: options.pageSize
+          newOptions = angular.copy(newOptions);
+          if (options) angular.forEach(['sortName', 'sortOrder', 'pageNumber', 'pageSize'], function (key) {
+            if (key in options) newOptions[key] = options[key];
           });
           });
           options = newOptions;
           options = newOptions;
           $el.bootstrapTable(options);
           $el.bootstrapTable(options);