Merge pull request #703 from djhvscf/master

Added support for Reorder extension

src/bootstrap-table.js

@@ -804,7 +804,7 @@
             $keepOpen.find('input').off('click').on('click', function () {
                 var $this = $(this);
 
-                that.toggleColumn($this.val(), $this.prop('checked'), false);
+                that.toggleColumn(getFieldIndex(that.options.columns, $(this).data('field')), $this.prop('checked'), false);
                 that.trigger('column-switch', $(this).data('field'), $this.prop('checked'));
             });
         }

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

@@ -1,13 +1,26 @@
 /**
  * @author: Dennis Hernández
  * @webSite: http://djhvscf.github.io/Blog
- * @version: v1.0.0
+ * @version: v1.1.0
  */
 
 !function ($) {
 
     'use strict';
 
+    var getFieldIndex = function (columns, field) {
+        var index = -1;
+
+        $.each(columns, function (i, column) {
+            if (column.field === field) {
+                index = i;
+                return false;
+            }
+            return true;
+        });
+        return index;
+    };
+
     $.extend($.fn.bootstrapTable.defaults, {
         reorderable: false,
         maxMovingRows: 10,
@@ -21,7 +34,10 @@
     });
 
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
-        _initHeader = BootstrapTable.prototype.initHeader;
+        _initHeader = BootstrapTable.prototype.initHeader,
+        _toggleColumn = BootstrapTable.prototype.toggleColumn,
+        _toggleView = BootstrapTable.prototype.toggleView,
+        _resetView = BootstrapTable.prototype.resetView;
 
     BootstrapTable.prototype.initHeader = function () {
         _initHeader.apply(this, Array.prototype.slice.apply(arguments));
@@ -33,18 +49,66 @@
         this.makeColumnsReorderable();
     };
 
+    BootstrapTable.prototype.toggleColumn = function () {
+        _toggleColumn.apply(this, Array.prototype.slice.apply(arguments));
+
+        if (!this.options.reorderable) {
+            return;
+        }
+
+        this.makeColumnsReorderable();
+    };
+
+    BootstrapTable.prototype.toggleView = function () {
+        _toggleView.apply(this, Array.prototype.slice.apply(arguments));
+
+        if (!this.options.reorderable) {
+            return;
+        }
+
+        if (this.options.cardView) {
+            return;
+        }
+
+        this.makeColumnsReorderable();
+    };
+
+    BootstrapTable.prototype.resetView = function () {
+        _resetView.apply(this, Array.prototype.slice.apply(arguments));
+
+        if (!this.options.reorderable) {
+            return;
+        }
+
+        this.makeColumnsReorderable();
+    };
+
     BootstrapTable.prototype.makeColumnsReorderable = function () {
 
         var that = this;
+        try {
+            $(this.$el).dragtable('destroy');
+        } catch (e) {}
         $(this.$el).dragtable({
             maxMovingRows: that.options.maxMovingRows,
             clickDelay:200,
             beforeStop: function() {
-                var ths = [];
+                var ths = [],
+                    columns = [],
+                    columnIndex = -1;
                 that.$header.find('th').each(function (i) {
                     ths.push($(this).data('field'));
                 });
 
+                for (var i = 0; i < ths.length; i++ ) {
+                    columnIndex = getFieldIndex(that.options.columns, ths[i]);
+                    if (columnIndex !== -1) {
+                        columns.push(that.options.columns[columnIndex]);
+                        that.options.columns.slice(columnIndex, 1);
+                    }
+                }
+
+                that.options.columns = that.options.columns.concat(columns);
                 that.header.fields = ths;
                 that.resetView();
                 that.trigger('reorder', ths);