bootstrap-table-rails 1.18.0 → 1.18.1

data/vendor/assets/javascripts/bootstrap-table/extensions/filter-control/bootstrap-table-filter-control.js

@@ -2005,7 +2005,7 @@
 	  var options = getOptionsFromSelectControl(selectControl);
 
 	  for (var i = 0; i < options.length; i++) {
-	    if (options[i].value === value.toString()) {
+	    if (options[i].value === Utils.unescapeHTML(value.toString())) {
 	      // The value is not valid to add
 	      return true;
 	    }
@@ -2101,8 +2101,8 @@
 	  if (that.options.valuesFilterControl.length > 0) {
 	    //  Callback to apply after settings fields values
 	    var fieldToFocusCallback = null;
-	    searchControls.each(function (index, ele) {
-	      var $this = $(this);
+	    searchControls.each(function (i, el) {
+	      var $this = $(el);
 	      field = $this.closest('[data-field]').data('field');
 	      result = that.options.valuesFilterControl.filter(function (valueObj) {
 	        return valueObj.field === field;
@@ -2222,7 +2222,8 @@
 	            addOptionToSelectControl(selectControl, value, value, column.filterDefault);
 	          });
 	          continue;
-	        }
+	        } // eslint-disable-next-line guard-for-in
+
 
 	        for (var key in uniqueValues) {
 	          addOptionToSelectControl(selectControl, uniqueValues[key], key, column.filterDefault);
@@ -2357,7 +2358,7 @@
 
 	      if (value && value.length > 0 && value.trim()) {
 	        $select.find('option[selected]').removeAttr('selected');
-	        $select.find('option[value="' + value + '"]').attr('selected', true);
+	        $select.find("option[value=\"".concat(value, "\"]")).attr('selected', true);
 	      } else {
 	        $select.find('option[selected]').removeAttr('selected');
 	      }
@@ -2410,12 +2411,20 @@
 
 	    if (header.find('.date-filter-control').length > 0) {
 	      $.each(that.columns, function (i, _ref8) {
-	        var filterControl = _ref8.filterControl,
+	        var filterDefault = _ref8.filterDefault,
+	            filterControl = _ref8.filterControl,
 	            field = _ref8.field,
 	            filterDatepickerOptions = _ref8.filterDatepickerOptions;
 
 	        if (filterControl !== undefined && filterControl.toLowerCase() === 'datepicker') {
-	          header.find(".date-filter-control.bootstrap-table-filter-control-".concat(field)).datepicker(filterDatepickerOptions).on('changeDate', function (_ref9) {
+	          var $datepicker = header.find(".date-filter-control.bootstrap-table-filter-control-".concat(field));
+	          $datepicker.datepicker(filterDatepickerOptions);
+
+	          if (filterDefault) {
+	            $datepicker.datepicker('setDate', filterDefault);
+	          }
+
+	          $datepicker.on('changeDate', function (_ref9) {
 	            var currentTarget = _ref9.currentTarget,
 	                keyCode = _ref9.keyCode;
 	            clearTimeout(currentTarget.timeoutId || 0);
@@ -2487,7 +2496,7 @@
 	}
 	var filterDataMethods = {
 	  func: function func(filterDataSource, selectControl, filterOrderBy, selected) {
-	    var variableValues = window[filterDataSource].apply();
+	    var variableValues = window[filterDataSource].apply(); // eslint-disable-next-line guard-for-in
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);
@@ -2504,7 +2513,8 @@
 	      objectKeys.forEach(function (key) {
 	        variableValues = variableValues[key];
 	      });
-	    }
+	    } // eslint-disable-next-line guard-for-in
+
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);
@@ -2531,6 +2541,7 @@
 	      url: filterDataSource,
 	      dataType: 'json',
 	      success: function success(data) {
+	        // eslint-disable-next-line guard-for-in
 	        for (var key in data) {
 	          addOptionToSelectControl(selectControl, key, data[key], selected);
 	        }
@@ -2540,7 +2551,7 @@
 	    });
 	  },
 	  json: function json(filterDataSource, selectControl, filterOrderBy, selected) {
-	    var variableValues = JSON.parse(filterDataSource);
+	    var variableValues = JSON.parse(filterDataSource); // eslint-disable-next-line guard-for-in
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);
@@ -2554,6 +2565,7 @@
 	$.extend($.fn.bootstrapTable.defaults, {
 	  filterControl: false,
 	  filterControlVisible: true,
+	  // eslint-disable-next-line no-unused-vars
 	  onColumnSearch: function onColumnSearch(field, text) {
 	    return false;
 	  },
@@ -2584,7 +2596,7 @@
 	  // input, select, datepicker
 	  filterDataCollector: undefined,
 	  filterData: undefined,
-	  filterDatepickerOptions: undefined,
+	  filterDatepickerOptions: {},
 	  filterStrictSearch: false,
 	  filterStartsWithSearch: false,
 	  filterControlPlaceholder: '',
@@ -2727,7 +2739,7 @@
 	        keys.forEach(function (key) {
 	          var thisColumn = that.columns[that.fieldsColumnsIndex[key]];
 	          var fval = (fp[key] || '').toLowerCase();
-	          var value = Utils$1.getItemField(item, key, false);
+	          var value = Utils$1.unescapeHTML(Utils$1.getItemField(item, key, false));
 	          var tmpItemIsExpected;
 
 	          if (fval === '') {
@@ -2835,7 +2847,7 @@
 
 	      if (filterColumnsDefaults) {
 	        this.filterColumnsPartial = filterColumnsDefaults;
-	        this.updatePagination();
+	        this.updatePagination(); // eslint-disable-next-line guard-for-in
 
 	        for (var filter in filterColumnsDefaults) {
 	          this.trigger('column-search', filter, filterColumnsDefaults[filter]);
@@ -2882,12 +2894,12 @@
 	      if (this.options.showFilterControlSwitch) {
 	        this.buttons = Object.assign(this.buttons, {
 	          filterControlSwitch: {
-	            'text': this.options.filterControlVisible ? this.options.formatFilterControlSwitchHide() : this.options.formatFilterControlSwitchShow(),
-	            'icon': this.options.filterControlVisible ? this.options.icons.filterControlSwitchHide : this.options.icons.filterControlSwitchShow,
-	            'event': this.toggleFilterControl,
-	            'attributes': {
+	            text: this.options.filterControlVisible ? this.options.formatFilterControlSwitchHide() : this.options.formatFilterControlSwitchShow(),
+	            icon: this.options.filterControlVisible ? this.options.icons.filterControlSwitchHide : this.options.icons.filterControlSwitchShow,
+	            event: this.toggleFilterControl,
+	            attributes: {
 	              'aria-label': this.options.formatFilterControlSwitch(),
-	              'title': this.options.formatFilterControlSwitch()
+	              title: this.options.formatFilterControlSwitch()
 	            }
 	          }
 	        });
@@ -3011,7 +3023,7 @@
 
 	      var icon = this.options.showButtonIcons ? this.options.filterControlVisible ? this.options.icons.filterControlSwitchHide : this.options.icons.filterControlSwitchShow : '';
 	      var text = this.options.showButtonText ? this.options.filterControlVisible ? this.options.formatFilterControlSwitchHide() : this.options.formatFilterControlSwitchShow() : '';
-	      this.$toolbar.find('>.columns').find('.filter-control-switch').html(Utils$1.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon) + ' ' + text);
+	      this.$toolbar.find('>.columns').find('.filter-control-switch').html("".concat(Utils$1.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(text));
 	    }
 	  }]);
 

data/vendor/assets/javascripts/bootstrap-table/extensions/filter-control/utils.js

@@ -1787,7 +1787,7 @@
 	  var options = getOptionsFromSelectControl(selectControl);
 
 	  for (var i = 0; i < options.length; i++) {
-	    if (options[i].value === value.toString()) {
+	    if (options[i].value === Utils.unescapeHTML(value.toString())) {
 	      // The value is not valid to add
 	      return true;
 	    }
@@ -1883,8 +1883,8 @@
 	  if (that.options.valuesFilterControl.length > 0) {
 	    //  Callback to apply after settings fields values
 	    var fieldToFocusCallback = null;
-	    searchControls.each(function (index, ele) {
-	      var $this = $(this);
+	    searchControls.each(function (i, el) {
+	      var $this = $(el);
 	      field = $this.closest('[data-field]').data('field');
 	      result = that.options.valuesFilterControl.filter(function (valueObj) {
 	        return valueObj.field === field;
@@ -2004,7 +2004,8 @@
 	            addOptionToSelectControl(selectControl, value, value, column.filterDefault);
 	          });
 	          continue;
-	        }
+	        } // eslint-disable-next-line guard-for-in
+
 
 	        for (var key in uniqueValues) {
 	          addOptionToSelectControl(selectControl, uniqueValues[key], key, column.filterDefault);
@@ -2139,7 +2140,7 @@
 
 	      if (value && value.length > 0 && value.trim()) {
 	        $select.find('option[selected]').removeAttr('selected');
-	        $select.find('option[value="' + value + '"]').attr('selected', true);
+	        $select.find("option[value=\"".concat(value, "\"]")).attr('selected', true);
 	      } else {
 	        $select.find('option[selected]').removeAttr('selected');
 	      }
@@ -2192,12 +2193,20 @@
 
 	    if (header.find('.date-filter-control').length > 0) {
 	      $.each(that.columns, function (i, _ref8) {
-	        var filterControl = _ref8.filterControl,
+	        var filterDefault = _ref8.filterDefault,
+	            filterControl = _ref8.filterControl,
 	            field = _ref8.field,
 	            filterDatepickerOptions = _ref8.filterDatepickerOptions;
 
 	        if (filterControl !== undefined && filterControl.toLowerCase() === 'datepicker') {
-	          header.find(".date-filter-control.bootstrap-table-filter-control-".concat(field)).datepicker(filterDatepickerOptions).on('changeDate', function (_ref9) {
+	          var $datepicker = header.find(".date-filter-control.bootstrap-table-filter-control-".concat(field));
+	          $datepicker.datepicker(filterDatepickerOptions);
+
+	          if (filterDefault) {
+	            $datepicker.datepicker('setDate', filterDefault);
+	          }
+
+	          $datepicker.on('changeDate', function (_ref9) {
 	            var currentTarget = _ref9.currentTarget,
 	                keyCode = _ref9.keyCode;
 	            clearTimeout(currentTarget.timeoutId || 0);
@@ -2269,7 +2278,7 @@
 	}
 	var filterDataMethods = {
 	  func: function func(filterDataSource, selectControl, filterOrderBy, selected) {
-	    var variableValues = window[filterDataSource].apply();
+	    var variableValues = window[filterDataSource].apply(); // eslint-disable-next-line guard-for-in
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);
@@ -2286,7 +2295,8 @@
 	      objectKeys.forEach(function (key) {
 	        variableValues = variableValues[key];
 	      });
-	    }
+	    } // eslint-disable-next-line guard-for-in
+
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);
@@ -2313,6 +2323,7 @@
 	      url: filterDataSource,
 	      dataType: 'json',
 	      success: function success(data) {
+	        // eslint-disable-next-line guard-for-in
 	        for (var key in data) {
 	          addOptionToSelectControl(selectControl, key, data[key], selected);
 	        }
@@ -2322,7 +2333,7 @@
 	    });
 	  },
 	  json: function json(filterDataSource, selectControl, filterOrderBy, selected) {
-	    var variableValues = JSON.parse(filterDataSource);
+	    var variableValues = JSON.parse(filterDataSource); // eslint-disable-next-line guard-for-in
 
 	    for (var key in variableValues) {
 	      addOptionToSelectControl(selectControl, key, variableValues[key], selected);

data/vendor/assets/javascripts/bootstrap-table/extensions/fixed-columns/bootstrap-table-fixed-columns.js

@@ -1224,6 +1224,14 @@
 
 	      (_get2 = _get(_getPrototypeOf(_class.prototype), "initBody", this)).call.apply(_get2, [this].concat(args));
 
+	      if (this.$fixedColumns && this.$fixedColumns.length) {
+	        this.$fixedColumns.toggle(this.fixedColumnsSupported());
+	      }
+
+	      if (this.$fixedColumnsRight && this.$fixedColumnsRight.length) {
+	        this.$fixedColumnsRight.toggle(this.fixedColumnsSupported());
+	      }
+
 	      if (!this.fixedColumnsSupported()) {
 	        return;
 	      }

data/vendor/assets/javascripts/bootstrap-table/extensions/group-by-v2/bootstrap-table-group-by.js

@@ -1285,7 +1285,7 @@
 	      if (this.options.customSort) {
 	        Utils.calculateObjectValue(this.options, this.options.customSort, [this.options.sortName, this.options.sortOrder, this.data]);
 	      } else {
-	        this.data.sort(function (a, b) {
+	        this.options.data.sort(function (a, b) {
 	          var groupByFields = _this.getGroupByFields();
 
 	          var fieldValuesA = [];
@@ -1354,10 +1354,8 @@
 	    this.columns.forEach(function (column) {
 	      if (column.checkbox) {
 	        checkBox = true;
-	      } else {
-	        if (column.visible) {
-	          visibleColumns += 1;
-	        }
+	      } else if (column.visible) {
+	        visibleColumns += 1;
 	      }
 	    });
 
@@ -1379,8 +1377,8 @@
 
 	      var formattedValue = item.name;
 
-	      if (typeof that.options.groupByFormatter === 'function') {
-	        formattedValue = that.options.groupByFormatter(item.name, item.id, item.data);
+	      if (that.options.groupByFormatter !== undefined) {
+	        formattedValue = Utils.calculateObjectValue(that.options, that.options.groupByFormatter, [item.name, item.id, item.data]);
 	      }
 
 	      html.push('<td', Utils.sprintf(' colspan="%s"', visibleColumns), '>', formattedValue);
@@ -1410,9 +1408,15 @@
 
 	    if (this.options.groupByToggle) {
 	      this.$container.off('click', '.groupBy').on('click', '.groupBy', function () {
-	        $(this).toggleClass('expanded collapsed');
-	        $(this).find('span').toggleClass("".concat(that.options.icons.collapseGroup, " ").concat(that.options.icons.expandGroup));
-	        that.$body.find("tr[data-parent-index=".concat($(this).closest('tr').data('group-index'), "]")).toggleClass('hidden');
+	        var $this = $(this);
+	        var groupIndex = $this.closest('tr').data('group-index');
+	        var $groupRows = that.$body.find("tr[data-parent-index=".concat(groupIndex, "]"));
+	        $this.toggleClass('expanded collapsed');
+	        $this.find('span').toggleClass("".concat(that.options.icons.collapseGroup, " ").concat(that.options.icons.expandGroup));
+	        $groupRows.toggleClass('hidden');
+	        $groupRows.each(function (i, element) {
+	          return that.collapseRow($(element).data('index'));
+	        });
 	      });
 	    }
 

data/vendor/assets/javascripts/bootstrap-table/extensions/mobile/bootstrap-table-mobile.js

@@ -1141,7 +1141,7 @@
 	      }
 
 	      if (this.options.minWidth < 100 && this.options.resizable) {
-	        console.info('The minWidth when the resizable extension is active should be greater or equal than 100');
+	        console.warn('The minWidth when the resizable extension is active should be greater or equal than 100');
 	        this.options.minWidth = 100;
 	      }
 
@@ -1221,12 +1221,10 @@
 	        } else if (width > this.options.minWidth && height > this.options.minHeight) {
 	          this.conditionFullView();
 	        }
-	      } else {
-	        if (width <= this.options.minWidth) {
-	          this.conditionCardView();
-	        } else if (width > this.options.minWidth) {
-	          this.conditionFullView();
-	        }
+	      } else if (width <= this.options.minWidth) {
+	        this.conditionCardView();
+	      } else if (width > this.options.minWidth) {
+	        this.conditionFullView();
 	      }
 
 	      this.resetView();

data/vendor/assets/javascripts/bootstrap-table/extensions/multiple-sort/bootstrap-table-multiple-sort.js

@@ -1248,13 +1248,40 @@
 
 	var isSingleSort = false;
 	var Utils = $.fn.bootstrapTable.utils;
+	$.extend($.fn.bootstrapTable.defaults.icons, {
+	  plus: {
+	    bootstrap3: 'glyphicon-plus',
+	    bootstrap4: 'fa-plus',
+	    bootstrap5: 'fa-plus',
+	    semantic: 'fa-plus',
+	    materialize: 'plus',
+	    foundation: 'fa-plus',
+	    bulma: 'fa-plus',
+	    'bootstrap-table': 'icon-plus'
+	  }[$.fn.bootstrapTable.theme] || 'fa-clock',
+	  minus: {
+	    bootstrap3: 'glyphicon-minus',
+	    bootstrap4: 'fa-minus',
+	    bootstrap5: 'fa-minus',
+	    semantic: 'fa-minus',
+	    materialize: 'minus',
+	    foundation: 'fa-minus',
+	    bulma: 'fa-minus',
+	    'bootstrap-table': 'icon-minus'
+	  }[$.fn.bootstrapTable.theme] || 'fa-clock',
+	  sort: {
+	    bootstrap3: 'glyphicon-sort',
+	    bootstrap4: 'fa-sort',
+	    bootstrap5: 'fa-sort',
+	    semantic: 'fa-sort',
+	    materialize: 'sort',
+	    foundation: 'fa-sort',
+	    bulma: 'fa-sort',
+	    'bootstrap-table': 'icon-sort-amount-asc'
+	  }[$.fn.bootstrapTable.theme] || 'fa-clock'
+	});
 	var theme = {
 	  bootstrap3: {
-	    icons: {
-	      plus: 'glyphicon-plus',
-	      minus: 'glyphicon-minus',
-	      sort: 'glyphicon-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"modal fade\" id=\"%s\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n        <div class=\"modal-dialog\">\n            <div class=\"modal-content\">\n                <div class=\"modal-header\">\n                    <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\"><span aria-hidden=\"true\">&times;</span></button>\n                     <h4 class=\"modal-title\" id=\"%sLabel\">%s</h4>\n                </div>\n                <div class=\"modal-body\">\n                    <div class=\"bootstrap-table\">\n                        <div class=\"fixed-table-toolbar\">\n                            <div class=\"bars\">\n                                <div id=\"toolbar\">\n                                     <button id=\"add\" type=\"button\" class=\"btn btn-default\">%s %s</button>\n                                     <button id=\"delete\" type=\"button\" class=\"btn btn-default\" disabled>%s %s</button>\n                                </div>\n                            </div>\n                        </div>\n                        <div class=\"fixed-table-container\">\n                            <table id=\"multi-sort\" class=\"table\">\n                                <thead>\n                                    <tr>\n                                        <th></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                    </tr>\n                                </thead>\n                                <tbody></tbody>\n                            </table>\n                        </div>\n                    </div>\n                </div>\n                <div class=\"modal-footer\">\n                     <button type=\"button\" class=\"btn btn-default\" data-dismiss=\"modal\">%s</button>\n                     <button type=\"button\" class=\"btn btn-primary multi-sort-order-button\">%s</button>\n                </div>\n            </div>\n        </div>\n    </div>\n      ",
 	      multipleSortButton: '<button class="multi-sort btn btn-default" type="button" data-toggle="modal" data-target="#%s" title="%s">%s</button>',
@@ -1262,11 +1289,6 @@
 	    }
 	  },
 	  bootstrap4: {
-	    icons: {
-	      'plus': 'fa-plus',
-	      'minus': 'fa-minus',
-	      'sort': 'fa-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"modal fade\" id=\"%s\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n          <div class=\"modal-dialog\" role=\"document\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h5 class=\"modal-title\" id=\"%sLabel\">%s</h5>\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n              </div>\n              <div class=\"modal-body\">\n                <div class=\"bootstrap-table\">\n                        <div class=\"fixed-table-toolbar\">\n                            <div class=\"bars\">\n                                <div id=\"toolbar\" class=\"pb-3\">\n                                     <button id=\"add\" type=\"button\" class=\"btn btn-secondary\">%s %s</button>\n                                     <button id=\"delete\" type=\"button\" class=\"btn btn-secondary\" disabled>%s %s</button>\n                                </div>\n                            </div>\n                        </div>\n                        <div class=\"fixed-table-container\">\n                            <table id=\"multi-sort\" class=\"table\">\n                                <thead>\n                                    <tr>\n                                        <th></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                    </tr>\n                                </thead>\n                                <tbody></tbody>\n                            </table>\n                        </div>\n                    </div>\n              </div>\n              <div class=\"modal-footer\">\n                <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">%s</button>\n                <button type=\"button\" class=\"btn btn-primary multi-sort-order-button\">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      ",
 	      multipleSortButton: '<button class="multi-sort btn btn-secondary" type="button" data-toggle="modal" data-target="#%s" title="%s">%s</button>',
@@ -1274,11 +1296,6 @@
 	    }
 	  },
 	  bootstrap5: {
-	    icons: {
-	      'plus': 'fa-plus',
-	      'minus': 'fa-minus',
-	      'sort': 'fa-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"modal fade\" id=\"%s\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n          <div class=\"modal-dialog\" role=\"document\">\n            <div class=\"modal-content\">\n              <div class=\"modal-header\">\n                <h5 class=\"modal-title\" id=\"%sLabel\">%s</h5>\n                <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-label=\"Close\">\n                  <span aria-hidden=\"true\">&times;</span>\n                </button>\n              </div>\n              <div class=\"modal-body\">\n                <div class=\"bootstrap-table\">\n                        <div class=\"fixed-table-toolbar\">\n                            <div class=\"bars\">\n                                <div id=\"toolbar\" class=\"pb-3\">\n                                     <button id=\"add\" type=\"button\" class=\"btn btn-secondary\">%s %s</button>\n                                     <button id=\"delete\" type=\"button\" class=\"btn btn-secondary\" disabled>%s %s</button>\n                                </div>\n                            </div>\n                        </div>\n                        <div class=\"fixed-table-container\">\n                            <table id=\"multi-sort\" class=\"table\">\n                                <thead>\n                                    <tr>\n                                        <th></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                         <th><div class=\"th-inner\">%s</div></th>\n                                    </tr>\n                                </thead>\n                                <tbody></tbody>\n                            </table>\n                        </div>\n                    </div>\n              </div>\n              <div class=\"modal-footer\">\n                <button type=\"button\" class=\"btn btn-secondary\" data-dismiss=\"modal\">%s</button>\n                <button type=\"button\" class=\"btn btn-primary multi-sort-order-button\">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      ",
 	      multipleSortButton: '<button class="multi-sort btn btn-secondary" type="button" data-toggle="modal" data-target="#%s" title="%s">%s</button>',
@@ -1286,11 +1303,6 @@
 	    }
 	  },
 	  semantic: {
-	    icons: {
-	      'plus': 'fa-plus',
-	      'minus': 'fa-minus',
-	      'sort': 'fa-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"ui modal tiny\" id=\"%s\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n        <i class=\"close icon\"></i>\n        <div class=\"header\" id=\"%sLabel\">\n          %s\n        </div>\n        <div class=\"image content\">\n          <div class=\"bootstrap-table\">\n            <div class=\"fixed-table-toolbar\">\n                <div class=\"bars\">\n                  <div id=\"toolbar\" class=\"pb-3\">\n                    <button id=\"add\" type=\"button\" class=\"ui button\">%s %s</button>\n                    <button id=\"delete\" type=\"button\" class=\"ui button\" disabled>%s %s</button>\n                  </div>\n                </div>\n            </div>\n            <div class=\"fixed-table-container\">\n                <table id=\"multi-sort\" class=\"table\">\n                    <thead>\n                        <tr>\n                            <th></th>\n                            <th><div class=\"th-inner\">%s</div></th>\n                            <th><div class=\"th-inner\">%s</div></th>\n                        </tr>\n                    </thead>\n                    <tbody></tbody>\n                </table>\n            </div>\n          </div>\n        </div>\n        <div class=\"actions\">\n          <div class=\"ui button deny\">%s</div>\n          <div class=\"ui button approve multi-sort-order-button\">%s</div>\n        </div>\n      </div>\n      ",
 	      multipleSortButton: '<button class="multi-sort ui button" type="button" data-toggle="modal" data-target="#%s" title="%s">%s</button>',
@@ -1298,11 +1310,6 @@
 	    }
 	  },
 	  materialize: {
-	    icons: {
-	      'plus': 'plus',
-	      'minus': 'minus',
-	      'sort': 'sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div id=\"%s\" class=\"modal\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n          <div class=\"modal-content\" id=\"%sLabel\">\n            <h4>%s</h4>\n            <div class=\"bootstrap-table\">\n            <div class=\"fixed-table-toolbar\">\n                <div class=\"bars\">\n                  <div id=\"toolbar\" class=\"pb-3\">\n                    <button id=\"add\" type=\"button\" class=\"waves-effect waves-light btn\">%s %s</button>\n                    <button id=\"delete\" type=\"button\" class=\"waves-effect waves-light btn\" disabled>%s %s</button>\n                  </div>\n                </div>\n            </div>\n            <div class=\"fixed-table-container\">\n                <table id=\"multi-sort\" class=\"table\">\n                    <thead>\n                        <tr>\n                            <th></th>\n                            <th><div class=\"th-inner\">%s</div></th>\n                            <th><div class=\"th-inner\">%s</div></th>\n                        </tr>\n                    </thead>\n                    <tbody></tbody>\n                </table>\n            </div>\n          </div>\n          <div class=\"modal-footer\">\n            <a href=\"javascript:void(0)\" class=\"modal-close waves-effect waves-light btn\">%s</a>\n            <a href=\"javascript:void(0)\" class=\"modal-close waves-effect waves-light btn multi-sort-order-button\">%s</a>\n          </div>\n          </div>\n        </div>\n      ",
 	      multipleSortButton: '<a href="#%s" class="multi-sort waves-effect waves-light btn modal-trigger" type="button" data-toggle="modal" title="%s">%s</a>',
@@ -1310,11 +1317,6 @@
 	    }
 	  },
 	  foundation: {
-	    icons: {
-	      'plus': 'fa-plus',
-	      'minus': 'fa-minus',
-	      'sort': 'fa-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"reveal\" id=\"%s\" data-reveal aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n            <div id=\"%sLabel\">\n              <h1>%s</h1>\n              <div class=\"bootstrap-table\">\n                <div class=\"fixed-table-toolbar\">\n                    <div class=\"bars\">\n                      <div id=\"toolbar\" class=\"padding-bottom-2\">\n                        <button id=\"add\" type=\"button\" class=\"waves-effect waves-light button\">%s %s</button>\n                        <button id=\"delete\" type=\"button\" class=\"waves-effect waves-light button\" disabled>%s %s</button>\n                      </div>\n                    </div>\n                </div>\n                <div class=\"fixed-table-container\">\n                    <table id=\"multi-sort\" class=\"table\">\n                        <thead>\n                            <tr>\n                                <th></th>\n                                <th><div class=\"th-inner\">%s</div></th>\n                                <th><div class=\"th-inner\">%s</div></th>\n                            </tr>\n                        </thead>\n                        <tbody></tbody>\n                    </table>\n                </div>\n              </div>\n\n              <button class=\"waves-effect waves-light button\" data-close aria-label=\"Close modal\" type=\"button\">\n                <span aria-hidden=\"true\">%s</span>\n              </button>\n              <button class=\"waves-effect waves-light button multi-sort-order-button\" data-close aria-label=\"Order\" type=\"button\">\n                  <span aria-hidden=\"true\">%s</span>\n              </button>\n            </div>\n        </div>\n      ",
 	      multipleSortButton: '<button class="button multi-sort" data-open="%s" title="%s">%s</button>',
@@ -1322,11 +1324,6 @@
 	    }
 	  },
 	  bulma: {
-	    icons: {
-	      'plus': 'fa-plus',
-	      'minus': 'fa-minus',
-	      'sort': 'fa-sort'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"modal\" id=\"%s\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n          <div class=\"modal-background\"></div>\n          <div class=\"modal-content\" id=\"%sLabel\">\n            <div class=\"box\">\n            <h2>%s</h2>\n              <div class=\"bootstrap-table\">\n                  <div class=\"fixed-table-toolbar\">\n                      <div class=\"bars\">\n                        <div id=\"toolbar\" class=\"padding-bottom-2\">\n                          <button id=\"add\" type=\"button\" class=\"waves-effect waves-light button\">%s %s</button>\n                          <button id=\"delete\" type=\"button\" class=\"waves-effect waves-light button\" disabled>%s %s</button>\n                        </div>\n                      </div>\n                  </div>\n                  <div class=\"fixed-table-container\">\n                      <table id=\"multi-sort\" class=\"table\">\n                          <thead>\n                              <tr>\n                                  <th></th>\n                                  <th><div class=\"th-inner\">%s</div></th>\n                                  <th><div class=\"th-inner\">%s</div></th>\n                              </tr>\n                          </thead>\n                          <tbody></tbody>\n                      </table>\n                    </div>\n                </div>\n                <button type=\"button\" class=\"waves-effect waves-light button\" data-close>%s</button>\n                <button type=\"button\" class=\"waves-effect waves-light button multi-sort-order-button\" data-close>%s</button>\n            </div>\n          </div>\n        </div>\n      ",
 	      multipleSortButton: '<button class="button multi-sort" data-target="%s" title="%s">%s</button>',
@@ -1334,11 +1331,6 @@
 	    }
 	  },
 	  'bootstrap-table': {
-	    icons: {
-	      'plus': 'icon-plus',
-	      'minus': 'icon-minus',
-	      'sort': 'icon-sort-amount-asc'
-	    },
 	    html: {
 	      multipleSortModal: "\n        <div class=\"modal\" id=\"%s\" aria-labelledby=\"%sLabel\" aria-hidden=\"true\">\n          <div class=\"modal-background\"></div>\n          <div class=\"modal-content\" id=\"%sLabel\">\n            <div class=\"box\">\n            <h2>%s</h2>\n              <div class=\"bootstrap-table\">\n                  <div class=\"fixed-table-toolbar\">\n                      <div class=\"bars\">\n                        <div id=\"toolbar\" class=\"padding-bottom-2\">\n                          <button id=\"add\" type=\"button\" class=\"btn\">%s %s</button>\n                          <button id=\"delete\" type=\"button\" class=\"btn\" disabled>%s %s</button>\n                        </div>\n                      </div>\n                  </div>\n                  <div class=\"fixed-table-container\">\n                      <table id=\"multi-sort\" class=\"table\">\n                          <thead>\n                              <tr>\n                                  <th></th>\n                                  <th><div class=\"th-inner\">%s</div></th>\n                                  <th><div class=\"th-inner\">%s</div></th>\n                              </tr>\n                          </thead>\n                          <tbody></tbody>\n                      </table>\n                    </div>\n                </div>\n                <div class=\"mt-30\">\n                    <button type=\"button\" class=\"btn\" data-close>%s</button>\n                    <button type=\"button\" class=\"btn multi-sort-order-button\" data-close>%s</button>\n                </div>\n            </div>\n          </div>\n        </div>\n      ",
 	      multipleSortButton: '<button class="btn multi-sort" data-target="%s" title="%s">%s</button>',
@@ -1355,7 +1347,7 @@
 	  var o = that.options;
 
 	  if (!$(_id).hasClass('modal')) {
-	    var sModal = Utils.sprintf(theme.html.multipleSortModal, _selector, _selector, _selector, that.options.formatMultipleSort(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, theme.icons.plus), that.options.formatAddLevel(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, theme.icons.minus), that.options.formatDeleteLevel(), that.options.formatColumn(), that.options.formatOrder(), that.options.formatCancel(), that.options.formatSort());
+	    var sModal = Utils.sprintf(theme.html.multipleSortModal, _selector, _selector, _selector, that.options.formatMultipleSort(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, o.icons.plus), that.options.formatAddLevel(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, o.icons.minus), that.options.formatDeleteLevel(), that.options.formatColumn(), that.options.formatOrder(), that.options.formatCancel(), that.options.formatSort());
 	    $('body').append($(sModal));
 	    that.$sortModal = $(_id);
 	    var $rows = that.$sortModal.find('tbody > tr');
@@ -1519,11 +1511,13 @@
 	    that.onMultipleSort();
 	  }
 
-	  this.buttons = Object.assign(this.buttons, {
-	    multipleSort: {
-	      'html': Utils.sprintf(theme.html.multipleSortButton, that.sortModalSelector, this.options.formatMultipleSort(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, theme.icons.sort))
-	    }
-	  });
+	  if (this.options.showMultiSortButton) {
+	    this.buttons = Object.assign(this.buttons, {
+	      multipleSort: {
+	        html: Utils.sprintf(theme.html.multipleSortButton, that.sortModalSelector, this.options.formatMultipleSort(), Utils.sprintf(that.constants.html.icon, o.iconsPrefix, o.icons.sort))
+	      }
+	    });
+	  }
 
 	  for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 	    args[_key] = arguments[_key];
@@ -1753,9 +1747,11 @@
 	  this.options.sortName = undefined;
 
 	  if (this.options.sidePagination === 'server') {
+	    var queryParams = this.options.queryParams;
+
 	    this.options.queryParams = function (params) {
 	      params.multiSort = _this2.options.sortPriority;
-	      return $.fn.bootstrapTable.utils.calculateObjectValue(_this2.options, _this2.options.queryParams, [params]);
+	      return $.fn.bootstrapTable.utils.calculateObjectValue(_this2.options, queryParams, [params]);
 	    };
 
 	    isSingleSort = false;

data/vendor/assets/javascripts/bootstrap-table/extensions/page-jump-to/bootstrap-table-page-jump-to.js

@@ -1028,9 +1028,32 @@
 	        var $jumpTo = $pageGroup.find('.page-jump-to');
 
 	        if (!$jumpTo.length) {
-	          $jumpTo = $("\n          <div class=\"page-jump-to ".concat(this.constants.classes.inputGroup, "\">\n          <input type=\"number\" class=\"").concat(this.constants.classes.input).concat(Utils.sprintf(' input-%s', this.options.iconSize), "\" value=\"").concat(this.options.pageNumber, "\">\n          <button class=\"").concat(this.constants.buttonsClass, "\"  type=\"button\">\n          ").concat(this.options.formatJumpTo(), "\n          </button>\n          </div>\n        ")).appendTo($pageGroup);
-	          $jumpTo.on('click', 'button', function (e) {
-	            _this.selectPage(+$(e.target).parent('.page-jump-to').find('input').val());
+	          $jumpTo = $(Utils.sprintf(this.constants.html.inputGroup, "<input type=\"number\"\n            class=\"".concat(this.constants.classes.input).concat(Utils.sprintf(' %s%s', this.constants.classes.inputPrefix, this.options.iconSize), "\"\n            value=\"").concat(this.options.pageNumber, "\"\n            min=\"1\"\n            max=\"").concat(this.totalPages, "\">"), "<button class=\"".concat(this.constants.buttonsClass, "\"  type=\"button\">\n          ").concat(this.options.formatJumpTo(), "\n          </button>"))).addClass('page-jump-to').appendTo($pageGroup);
+	          var $input = $jumpTo.find('input');
+	          $jumpTo.find('button').click(function () {
+	            _this.selectPage(+$input.val());
+	          });
+	          $input.keyup(function (e) {
+	            if ($input.val() === '') {
+	              return;
+	            }
+
+	            if (e.keyCode === 13) {
+	              _this.selectPage(+$input.val());
+
+	              return;
+	            }
+
+	            if (+$input.val() < +$input.attr('min')) {
+	              $input.val($input.attr('min'));
+	            } else if (+$input.val() > +$input.attr('max')) {
+	              $input.val($input.attr('max'));
+	            }
+	          });
+	          $input.blur(function () {
+	            if ($input.val() === '') {
+	              $input.val(_this.options.pageNumber);
+	            }
 	          });
 	        }
 	      }

data/vendor/assets/javascripts/bootstrap-table/extensions/pipeline/bootstrap-table-pipeline.js

@@ -893,9 +893,11 @@
 	$.extend($.fn.bootstrapTable.defaults, {
 	  usePipeline: false,
 	  pipelineSize: 1000,
+	  // eslint-disable-next-line no-unused-vars
 	  onCachedDataHit: function onCachedDataHit(data) {
 	    return false;
 	  },
+	  // eslint-disable-next-line no-unused-vars
 	  onCachedDataReset: function onCachedDataReset(data) {
 	    return false;
 	  }
@@ -906,7 +908,6 @@
 	});
 	var BootstrapTable = $.fn.bootstrapTable.Constructor;
 	var _init = BootstrapTable.prototype.init;
-	var _initServer = BootstrapTable.prototype.initServer;
 	var _onSearch = BootstrapTable.prototype.onSearch;
 	var _onSort = BootstrapTable.prototype.onSort;
 	var _onPageListChange = BootstrapTable.prototype.onPageListChange;
@@ -929,7 +930,7 @@
 	  this.resetCache = true;
 	};
 
-	BootstrapTable.prototype.onSearch = function (event) {
+	BootstrapTable.prototype.onSearch = function () {
 	  /* force a cache reset on search */
 	  if (this.options.usePipeline) {
 	    this.resetCache = true;
@@ -938,7 +939,7 @@
 	  _onSearch.apply(this, Array.prototype.slice.apply(arguments));
 	};
 
-	BootstrapTable.prototype.onSort = function (event) {
+	BootstrapTable.prototype.onSort = function () {
 	  /* force a cache reset on sort */
 	  if (this.options.usePipeline) {
 	    this.resetCache = true;
@@ -973,8 +974,8 @@
 	  for (var i = 0; i <= numWindows; i++) {
 	    var b = i * this.options.pipelineSize;
 	    this.cacheWindows[i] = {
-	      'lower': b,
-	      'upper': b + this.options.pipelineSize - 1
+	      lower: b,
+	      upper: b + this.options.pipelineSize - 1
 	    };
 	  }
 	};
@@ -1066,10 +1067,8 @@
 	            useAjax = false;
 	          }
 	        }
-	      } else {
-	        if (params.limit === 0) {
-	          delete params.limit;
-	        }
+	      } else if (params.limit === 0) {
+	        delete params.limit;
 	      }
 	    }
 	  } // force an ajax call - this is on search, sort or page size change