Merge pull request #33 from wenzhixin/master

Update my repo

CHANGELOG.md

@@ -14,6 +14,7 @@
 - [enh] `getData` method support to get the current page data.
 - [enh] Added `ro-RO` locale.
 - [enh] Added `table-no-bordered` class to remove table-bordered style.
+- [bug] Fix row state field value bug when there are disabled rows.
 
 ### 1.7.0
 

src/bootstrap-table.js

@@ -1248,6 +1248,8 @@
                                 (value && value.disabled) ? 'disabled' : undefined) +
                             ' />',
                         that.options.cardView ? '</div>' : '</td>'].join('');
+                        
+                    item[that.header.stateField] = value === true || (value && value.checked);
                 } else {
                     value = typeof value === 'undefined' || value === null ?
                         that.options.undefinedText : value;
@@ -1456,11 +1458,11 @@
         });
     };
 
-    BootstrapTable.prototype.updateRows = function (checked) {
+    BootstrapTable.prototype.updateRows = function () {
         var that = this;
 
         this.$selectItem.each(function () {
-            that.data[$(this).data('index')][that.header.stateField] = checked;
+            that.data[$(this).data('index')][that.header.stateField] = $(this).prop('checked');
         });
     };
 
@@ -1848,7 +1850,7 @@
             rows = this.getSelections();
         }
         this.$selectItem.filter(':enabled').prop('checked', checked);
-        this.updateRows(checked);
+        this.updateRows();
         this.updateSelected();
         if (checked) {
             rows = this.getSelections();

src/extensions/mobile/bootstrap-table-mobile.js

@@ -8,8 +8,6 @@
 
     'use strict';
 
-    var toggled = false;
-
     var resetView = function (el) {
         if (el.options.height || el.options.showFooter) {
             setTimeout(el.resetView(), 1);
@@ -43,9 +41,9 @@
     };
 
     var checkToggledStatus = function (targetToggledStatus, newToggledStatus, el) {
-        if (toggled === targetToggledStatus) {
+        if (el.options.toggled === targetToggledStatus) {
             el.toggleView();
-            toggled = newToggledStatus;
+            el.options.toggled = newToggledStatus;
         }
     };
 
@@ -53,7 +51,8 @@
         mobileResponsive: false,
         minWidth: 562,
         minHeight: undefined,
-        checkOnInit: true
+        checkOnInit: true,
+        toggled: false
     });
 
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
@@ -79,4 +78,4 @@
             changeView(this, $(window).width(), $(window).height());
         }
     };
-}(jQuery);
+}(jQuery);