From 9e8576917650dcc741ff137c7fa46344a97bb29e Mon Sep 17 00:00:00 2001
From: Paul Lockaby <paul@paullockaby.com>
Date: Sat, 7 Oct 2017 04:24:40 +0000
Subject: [PATCH 1/3] make work with jquery 3

---
 bootstrap-table-multiple-sort.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/bootstrap-table-multiple-sort.js b/bootstrap-table-multiple-sort.js
index 83c440f..beaecbf 100644
--- a/bootstrap-table-multiple-sort.js
+++ b/bootstrap-table-multiple-sort.js
@@ -10,9 +10,8 @@
 
     var isSingleSort = false;
 
-    var showSortModal = function(that) {
-        var _selector = that.$sortModal.selector,
-            _id = _selector.substr(1);
+    var showSortModal = function(that, sortModalId) {
+        var _id = sortModalId.substr(1);
 
         if (!$(_id).hasClass("modal")) {
             var sModal = '  <div class="modal fade" id="' + _id + '" tabindex="-1" role="dialog" aria-labelledby="' + _id + 'Label" aria-hidden="true">';
@@ -56,7 +55,7 @@
 
             $('body').append($(sModal));
 
-            that.$sortModal = $(_selector);
+            that.$sortModal = $(sortModalId);
             var $rows = that.$sortModal.find('tbody > tr');
 
             that.$sortModal.off('click', '#add').on('click', '#add', function() {
@@ -245,7 +244,7 @@
 
                 $btnGroup.append($multiSortBtn);
 
-                showSortModal(that);
+                showSortModal(that, sortModalId);
             }
 
             this.$el.on('sort.bs.table', function() {
@@ -271,7 +270,7 @@
 
                 that.assignSortableArrows();
                 that.$sortModal.remove();
-                showSortModal(that);
+                showSortModal(that, sortModalId);
             });
 
             this.$el.on('reset-view.bs.table', function() {
@@ -390,4 +389,4 @@
             this.$sortModal.find('#delete').attr('disabled', 'disabled');
         }
     };
-})(jQuery);
\ No newline at end of file
+})(jQuery);

From e91ff5a9cec3596e259df4701a00c82a5eb5f821 Mon Sep 17 00:00:00 2001
From: Paul Lockaby <paul@paullockaby.com>
Date: Sat, 7 Oct 2017 04:42:16 +0000
Subject: [PATCH 2/3] jshint warnings

---
 bootstrap-table-multiple-sort.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/bootstrap-table-multiple-sort.js b/bootstrap-table-multiple-sort.js
index beaecbf..7e31000 100644
--- a/bootstrap-table-multiple-sort.js
+++ b/bootstrap-table-multiple-sort.js
@@ -13,7 +13,7 @@
     var showSortModal = function(that, sortModalId) {
         var _id = sortModalId.substr(1);
 
-        if (!$(_id).hasClass("modal")) {
+        if (!$(_id).hasClass('modal')) {
             var sModal = '  <div class="modal fade" id="' + _id + '" tabindex="-1" role="dialog" aria-labelledby="' + _id + 'Label" aria-hidden="true">';
             sModal += '         <div class="modal-dialog">';
             sModal += '             <div class="modal-content">';
@@ -103,7 +103,7 @@
                 var sorted_fields = fields.sort();
 
                 for (var i = 0; i < fields.length - 1; i++) {
-                    if (sorted_fields[i + 1] == sorted_fields[i]) {
+                    if (sorted_fields[i + 1] === sorted_fields[i]) {
                         results.push(sorted_fields[i]);
                     }
                 }
@@ -354,8 +354,8 @@
         });
 
         if (sortPriority !== undefined) {
-            $multiSortName.find('option[value="' + sortPriority.sortName + '"]').attr("selected", true);
-            $multiSortOrder.find('option[value="' + sortPriority.sortOrder + '"]').attr("selected", true);
+            $multiSortName.find('option[value="' + sortPriority.sortName + '"]').attr('selected', true);
+            $multiSortOrder.find('option[value="' + sortPriority.sortOrder + '"]').attr('selected', true);
         }
     };
 
@@ -376,7 +376,7 @@
         var total = this.$sortModal.find('.multi-sort-name:first option').length,
             current = this.$sortModal.find('tbody tr').length;
 
-        if (current == total) {
+        if (current === total) {
             this.$sortModal.find('#add').attr('disabled', 'disabled');
         }
         if (current > 1) {
@@ -385,7 +385,7 @@
         if (current < total) {
             this.$sortModal.find('#add').removeAttr('disabled');
         }
-        if (current == 1) {
+        if (current === 1) {
             this.$sortModal.find('#delete').attr('disabled', 'disabled');
         }
     };

From 58bf303ef08bca2fbbca61bea13ba49bae7dfb92 Mon Sep 17 00:00:00 2001
From: Paul Lockaby <paul@paullockaby.com>
Date: Sat, 7 Oct 2017 05:06:56 +0000
Subject: [PATCH 3/3] make automatically sort when the table changes

---
 bootstrap-table-multiple-sort.js | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/bootstrap-table-multiple-sort.js b/bootstrap-table-multiple-sort.js
index 7e31000..780788a 100644
--- a/bootstrap-table-multiple-sort.js
+++ b/bootstrap-table-multiple-sort.js
@@ -223,8 +223,18 @@
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
 
     var BootstrapTable = $.fn.bootstrapTable.Constructor,
+        _initSort = BootstrapTable.prototype.initSort,
         _initToolbar = BootstrapTable.prototype.initToolbar;
 
+    BootstrapTable.prototype.initSort = function() {
+        var that = this;
+        if (!isSingleSort && that.options.sortPriority !== null && typeof that.options.sortPriority === 'object') {
+            that.onMultipleSort();
+        } else {
+            _initSort.apply(this, Array.prototype.slice.apply(arguments));
+        }
+    }
+
     BootstrapTable.prototype.initToolbar = function() {
         this.showToolbar = true;
         var that = this,