Merge pull request #2995 from SasSam/develop

fix #2993 - jQuery 3.x compatibility issue fix - .selector() replacement

src/extensions/multiple-sort/bootstrap-table-multiple-sort.js

@@ -11,16 +11,16 @@
     var isSingleSort = false;
 
     var showSortModal = function(that) {
-        var _selector = that.$sortModal.selector,
-            _id = _selector.substr(1);
+        var _selector = that.sortModalSelector,
+            _id = '#' + _selector;
 
         if (!$(_id).hasClass("modal")) {
-            var sModal = '  <div class="modal fade" id="' + _id + '" tabindex="-1" role="dialog" aria-labelledby="' + _id + 'Label" aria-hidden="true">';
+            var sModal = '  <div class="modal fade" id="' + _selector + '" tabindex="-1" role="dialog" aria-labelledby="' + _selector + 'Label" aria-hidden="true">';
             sModal += '         <div class="modal-dialog">';
             sModal += '             <div class="modal-content">';
             sModal += '                 <div class="modal-header">';
             sModal += '                     <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>';
-            sModal += '                     <h4 class="modal-title" id="' + _id + 'Label">' + that.options.formatMultipleSort() + '</h4>';
+            sModal += '                     <h4 class="modal-title" id="' + _selector + 'Label">' + that.options.formatMultipleSort() + '</h4>';
             sModal += '                 </div>';
             sModal += '                 <div class="modal-body">';
             sModal += '                     <div class="bootstrap-table">';
@@ -56,7 +56,7 @@
 
             $('body').append($(sModal));
 
-            that.$sortModal = $(_selector);
+            that.$sortModal = $(_id);
             var $rows = that.$sortModal.find('tbody > tr');
 
             that.$sortModal.off('click', '#add').on('click', '#add', function() {
@@ -229,8 +229,10 @@
     BootstrapTable.prototype.initToolbar = function() {
         this.showToolbar = true;
         var that = this,
-            sortModalId = '#sortModal_' + this.$el.attr('id');
+            sortModalSelector = 'sortModal_' + this.$el.attr('id'),
+            sortModalId = '#' + sortModalSelector;
         this.$sortModal = $(sortModalId);
+        this.sortModalSelector = sortModalSelector;
 
         _initToolbar.apply(this, Array.prototype.slice.apply(arguments));