Merge pull request #80 from wenzhixin/master

Update my repo

src/bootstrap-table.js

@@ -1729,7 +1729,8 @@
     };
 
     BootstrapTable.prototype.updateSelected = function () {
-        var checkAll = this.$selectItem.filter(':enabled').length ===
+        var checkAll = this.$selectItem.filter(':enabled').length &&
+            this.$selectItem.filter(':enabled').length ===
             this.$selectItem.filter(':enabled').filter(':checked').length;
 
         this.$selectAll.add(this.$selectAll_).prop('checked', checkAll);
@@ -2247,9 +2248,9 @@
         if (!checked) {
             rows = this.getSelections();
         }
+        this.$selectAll.add(this.$selectAll_).prop('checked', checked);
         this.$selectItem.filter(':enabled').prop('checked', checked);
         this.updateRows();
-        this.updateSelected();
         if (checked) {
             rows = this.getSelections();
         }

src/extensions/reorder-columns/bootstrap-table-reorder-columns.js

@@ -95,11 +95,13 @@
             clickDelay:200,
             beforeStop: function() {
                 var ths = [],
+                    formatters = [],
                     columns = [],
                     columnsHidden = [],
                     columnIndex = -1;
                 that.$header.find('th').each(function (i) {
                     ths.push($(this).data('field'));
+                    formatters.push($(this).data('formatter'));
                 });
 
                 //Exist columns not shown
@@ -109,6 +111,7 @@
                     });
                     for (var i = 0; i < columnsHidden.length; i++) {
                         ths.push(columnsHidden[i].field);
+                        formatters.push(columnsHidden[i].formatter);
                     }
                 }
 
@@ -122,9 +125,10 @@
 
                 that.columns = that.columns.concat(columns);
                 that.header.fields = ths;
+                that.header.formatters = formatters;
                 that.resetView();
                 that.trigger('reorder-column', ths);
             }
         });
     };
-}(jQuery);
+}(jQuery);