bootstrap-table-rails 1.17.1 → 1.18.0

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

@@ -1549,6 +1549,7 @@
 	    // 搜索name=general这种形式的字符串(&是分隔符)
 	    var pattern = "".concat(key, "=([^&]*)");
 	    var targetStr = "".concat(key, "=").concat(val);
+	    if (val === undefined) continue;
 	    /*
 	     * 如果目标url中包含了key键, 我们需要将它替换成我们自己的val
 	     * 不然就直接添加好了.
@@ -1569,6 +1570,20 @@
 
 	  return url;
 	}
+	/*
+	* function: _updateHistoryState
+	* var _prefix = this.options.addrPrefix || ''
+	* var table = this
+	* _updateHistoryState( table,_prefix)
+	* returns void
+	*/
+
+
+	function _updateHistoryState(table, _prefix) {
+	  var params = {};
+	  params["".concat(_prefix, "page")] = table.options.pageNumber, params["".concat(_prefix, "size")] = table.options.pageSize, params["".concat(_prefix, "order")] = table.options.sortOrder, params["".concat(_prefix, "sort")] = table.options.sortName, params["".concat(_prefix, "search")] = table.options.searchText;
+	  window.history.pushState({}, '', _buildUrl(params));
+	}
 
 	$.extend($.fn.bootstrapTable.defaults, {
 	  addrbar: false,
@@ -1592,7 +1607,7 @@
 	      var _this = this,
 	          _get2;
 
-	      if (this.options.pagination && this.options.sidePagination === 'server' && this.options.addrbar) {
+	      if (this.options.pagination && this.options.addrbar) {
 	        // 标志位, 初始加载后关闭
 	        this.addrbarInit = true;
 	        this.options.pageNumber = +this.getDefaultOptionValue('pageNumber', 'page');
@@ -1604,21 +1619,27 @@
 	        var _prefix = this.options.addrPrefix || '';
 
 	        var _onLoadSuccess = this.options.onLoadSuccess;
+	        var _onPageChange = this.options.onPageChange;
 
 	        this.options.onLoadSuccess = function (data) {
 	          if (_this.addrbarInit) {
 	            _this.addrbarInit = false;
 	          } else {
-	            var params = {};
-	            params["".concat(_prefix, "page")] = _this.options.pageNumber, params["".concat(_prefix, "size")] = _this.options.pageSize, params["".concat(_prefix, "order")] = _this.options.sortOrder, params["".concat(_prefix, "sort")] = _this.options.sortName, params["".concat(_prefix, "search")] = _this.options.searchText; // h5提供的修改浏览器地址栏的方法
-
-	            window.history.pushState({}, '', _buildUrl(params));
+	            _updateHistoryState(_this, _prefix);
 	          }
 
 	          if (_onLoadSuccess) {
 	            _onLoadSuccess.call(_this, data);
 	          }
 	        };
+
+	        this.options.onPageChange = function (number, size) {
+	          _updateHistoryState(_this, _prefix);
+
+	          if (_onPageChange) {
+	            _onPageChange.call(_this, number, size);
+	          }
+	        };
 	      }
 
 	      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {

data/vendor/assets/javascripts/bootstrap-table/extensions/auto-refresh/bootstrap-table-auto-refresh.js

@@ -885,6 +885,56 @@
 	// https://tc39.github.io/ecma262/#sec-array.prototype-@@unscopables
 	addToUnscopables(FIND);
 
+	var nativeAssign = Object.assign;
+	var defineProperty = Object.defineProperty;
+
+	// `Object.assign` method
+	// https://tc39.github.io/ecma262/#sec-object.assign
+	var objectAssign = !nativeAssign || fails(function () {
+	  // should have correct order of operations (Edge bug)
+	  if (descriptors && nativeAssign({ b: 1 }, nativeAssign(defineProperty({}, 'a', {
+	    enumerable: true,
+	    get: function () {
+	      defineProperty(this, 'b', {
+	        value: 3,
+	        enumerable: false
+	      });
+	    }
+	  }), { b: 2 })).b !== 1) return true;
+	  // should work with symbols and should have deterministic property order (V8 bug)
+	  var A = {};
+	  var B = {};
+	  // eslint-disable-next-line no-undef
+	  var symbol = Symbol();
+	  var alphabet = 'abcdefghijklmnopqrst';
+	  A[symbol] = 7;
+	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+	  return nativeAssign({}, A)[symbol] != 7 || objectKeys(nativeAssign({}, B)).join('') != alphabet;
+	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars
+	  var T = toObject(target);
+	  var argumentsLength = arguments.length;
+	  var index = 1;
+	  var getOwnPropertySymbols = objectGetOwnPropertySymbols.f;
+	  var propertyIsEnumerable = objectPropertyIsEnumerable.f;
+	  while (argumentsLength > index) {
+	    var S = indexedObject(arguments[index++]);
+	    var keys = getOwnPropertySymbols ? objectKeys(S).concat(getOwnPropertySymbols(S)) : objectKeys(S);
+	    var length = keys.length;
+	    var j = 0;
+	    var key;
+	    while (length > j) {
+	      key = keys[j++];
+	      if (!descriptors || propertyIsEnumerable.call(S, key)) T[key] = S[key];
+	    }
+	  } return T;
+	} : nativeAssign;
+
+	// `Object.assign` method
+	// https://tc39.github.io/ecma262/#sec-object.assign
+	_export({ target: 'Object', stat: true, forced: Object.assign !== objectAssign }, {
+	  assign: objectAssign
+	});
+
 	function _classCallCheck(instance, Constructor) {
 	  if (!(instance instanceof Constructor)) {
 	    throw new TypeError("Cannot call a class as a function");
@@ -1048,21 +1098,20 @@
 	    value: function initToolbar() {
 	      var _get3;
 
+	      if (this.options.autoRefresh) {
+	        this.buttons = Object.assign(this.buttons, {
+	          autoRefresh: {
+	            'html': "\n            <button class=\"auto-refresh ".concat(this.constants.buttonsClass, "\n              ").concat(this.options.autoRefreshStatus ? " ".concat(this.constants.classes.buttonActive) : '', "\"\n              type=\"button\" name=\"autoRefresh\" title=\"").concat(this.options.formatAutoRefresh(), "\">\n              ").concat(this.options.showButtonIcons ? Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.autoRefresh) : '', "\n              ").concat(this.options.showButtonText ? this.options.formatAutoRefresh() : '', "\n            </button>\n           "),
+	            'event': this.toggleAutoRefresh
+	          }
+	        });
+	      }
+
 	      for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
 	        args[_key2] = arguments[_key2];
 	      }
 
 	      (_get3 = _get(_getPrototypeOf(_class.prototype), "initToolbar", this)).call.apply(_get3, [this].concat(args));
-
-	      if (this.options.autoRefresh) {
-	        var $btnGroup = this.$toolbar.find('>.columns');
-	        var $btnAutoRefresh = $btnGroup.find('.auto-refresh');
-
-	        if (!$btnAutoRefresh.length) {
-	          $btnAutoRefresh = $("\n          <button class=\"auto-refresh ".concat(this.constants.buttonsClass, "\n          ").concat(this.options.autoRefreshStatus ? " ".concat(this.constants.classes.buttonActive) : '', "\"\n          type=\"button\" title=\"").concat(this.options.formatAutoRefresh(), "\">\n          ").concat(this.options.showButtonIcons ? Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.autoRefresh) : '', "\n          ").concat(this.options.showButtonText ? this.options.formatAutoRefresh() : '', "\n          </button>\n        ")).appendTo($btnGroup);
-	          $btnAutoRefresh.on('click', $.proxy(this.toggleAutoRefresh, this));
-	        }
-	      }
 	    }
 	  }, {
 	    key: "toggleAutoRefresh",
@@ -1072,14 +1121,14 @@
 	      if (this.options.autoRefresh) {
 	        if (this.options.autoRefreshStatus) {
 	          clearInterval(this.options.autoRefreshFunction);
-	          this.$toolbar.find('>.columns').find('.auto-refresh').removeClass(this.constants.classes.buttonActive);
+	          this.$toolbar.find('>.columns .auto-refresh').removeClass(this.constants.classes.buttonActive);
 	        } else {
 	          this.options.autoRefreshFunction = setInterval(function () {
 	            _this2.refresh({
 	              silent: _this2.options.autoRefreshSilent
 	            });
 	          }, this.options.autoRefreshInterval * 1000);
-	          this.$toolbar.find('>.columns').find('.auto-refresh').addClass(this.constants.classes.buttonActive);
+	          this.$toolbar.find('>.columns .auto-refresh').addClass(this.constants.classes.buttonActive);
 	        }
 
 	        this.options.autoRefreshStatus = !this.options.autoRefreshStatus;

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

@@ -1504,6 +1504,25 @@
 	  }
 	});
 
+	var $map = arrayIteration.map;
+
+
+
+	var HAS_SPECIES_SUPPORT$1 = arrayMethodHasSpeciesSupport('map');
+	// FF49- issue
+	var USES_TO_LENGTH$1 = HAS_SPECIES_SUPPORT$1 && !fails(function () {
+	  [].map.call({ length: -1, 0: 1 }, function (it) { throw it; });
+	});
+
+	// `Array.prototype.map` method
+	// https://tc39.github.io/ecma262/#sec-array.prototype.map
+	// with adding support of @@species
+	_export({ target: 'Array', proto: true, forced: !HAS_SPECIES_SUPPORT$1 || !USES_TO_LENGTH$1 }, {
+	  map: function map(callbackfn /* , thisArg */) {
+	    return $map(this, callbackfn, arguments.length > 1 ? arguments[1] : undefined);
+	  }
+	});
+
 	var TO_STRING_TAG$1 = wellKnownSymbol('toStringTag');
 	var test = {};
 
@@ -2419,7 +2438,7 @@
 
 	    switch (that.options.cookieStorage) {
 	      case 'cookieStorage':
-	        document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(that.options.cookieExpire)), that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', that.options.cookieSecure ? '; secure' : ''].join('');
+	        document.cookie = [cookieName, '=', encodeURIComponent(cookieValue), "; expires=".concat(UtilsCookie.calculateExpiration(that.options.cookieExpire)), that.options.cookiePath ? "; path=".concat(that.options.cookiePath) : '', that.options.cookieDomain ? "; domain=".concat(that.options.cookieDomain) : '', that.options.cookieSecure ? '; secure' : '', ';SameSite=' + that.options.cookieSameSite].join('');
 	        break;
 
 	      case 'localStorage':
@@ -2621,6 +2640,7 @@
 	  cookiePath: null,
 	  cookieDomain: null,
 	  cookieSecure: null,
+	  cookieSameSite: 'Lax',
 	  cookieIdTable: '',
 	  cookiesEnabled: ['bs.table.sortOrder', 'bs.table.sortName', 'bs.table.pageNumber', 'bs.table.pageList', 'bs.table.columns', 'bs.table.searchText', 'bs.table.filterControl', 'bs.table.filterBy', 'bs.table.reorderColumns'],
 	  cookieStorage: 'cookieStorage',
@@ -2812,7 +2832,9 @@
 
 	      (_get9 = _get(_getPrototypeOf(_class.prototype), "_toggleColumn", this)).call.apply(_get9, [this].concat(args));
 
-	      UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns()));
+	      UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns().map(function (column) {
+	        return column.field;
+	      })));
 	    }
 	  }, {
 	    key: "_toggleAllColumns",
@@ -2825,7 +2847,9 @@
 
 	      (_get10 = _get(_getPrototypeOf(_class.prototype), "_toggleAllColumns", this)).call.apply(_get10, [this].concat(args));
 
-	      UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns()));
+	      UtilsCookie.setCookie(this, UtilsCookie.cookieIds.columns, JSON.stringify(this.getVisibleColumns().map(function (column) {
+	        return column.field;
+	      })));
 	    }
 	  }, {
 	    key: "selectPage",
@@ -2881,6 +2905,8 @@
 	  }, {
 	    key: "initCookie",
 	    value: function initCookie() {
+	      var _this = this;
+
 	      if (!this.options.cookie) {
 	        return;
 	      }
@@ -2930,8 +2956,22 @@
 	        try {
 	          var _loop = function _loop() {
 	            var column = _step.value;
-	            column.visible = columnsCookie.filter(function (c) {
-	              return c.field === column.field;
+	            column.visible = columnsCookie.filter(function (columnField) {
+	              if (_this.isSelectionColumn(column)) {
+	                return true;
+	              }
+	              /**
+	               * This is needed for the old saved cookies or the table will show no columns!
+	               * It can be removed in 2-3 Versions Later!!
+	               * TODO: Remove this part some versions later e.g. 1.17.3
+	               */
+
+
+	              if (columnField instanceof Object) {
+	                return columnField.field === column.field;
+	              }
+
+	              return columnField === column.field;
 	            }).length > 0 || !column.switchable;
 	          };
 

data/vendor/assets/javascripts/bootstrap-table/extensions/copy-rows/bootstrap-table-copy-rows.js

@@ -906,6 +906,56 @@
 	  }
 	});
 
+	var nativeAssign = Object.assign;
+	var defineProperty = Object.defineProperty;
+
+	// `Object.assign` method
+	// https://tc39.github.io/ecma262/#sec-object.assign
+	var objectAssign = !nativeAssign || fails(function () {
+	  // should have correct order of operations (Edge bug)
+	  if (descriptors && nativeAssign({ b: 1 }, nativeAssign(defineProperty({}, 'a', {
+	    enumerable: true,
+	    get: function () {
+	      defineProperty(this, 'b', {
+	        value: 3,
+	        enumerable: false
+	      });
+	    }
+	  }), { b: 2 })).b !== 1) return true;
+	  // should work with symbols and should have deterministic property order (V8 bug)
+	  var A = {};
+	  var B = {};
+	  // eslint-disable-next-line no-undef
+	  var symbol = Symbol();
+	  var alphabet = 'abcdefghijklmnopqrst';
+	  A[symbol] = 7;
+	  alphabet.split('').forEach(function (chr) { B[chr] = chr; });
+	  return nativeAssign({}, A)[symbol] != 7 || objectKeys(nativeAssign({}, B)).join('') != alphabet;
+	}) ? function assign(target, source) { // eslint-disable-line no-unused-vars
+	  var T = toObject(target);
+	  var argumentsLength = arguments.length;
+	  var index = 1;
+	  var getOwnPropertySymbols = objectGetOwnPropertySymbols.f;
+	  var propertyIsEnumerable = objectPropertyIsEnumerable.f;
+	  while (argumentsLength > index) {
+	    var S = indexedObject(arguments[index++]);
+	    var keys = getOwnPropertySymbols ? objectKeys(S).concat(getOwnPropertySymbols(S)) : objectKeys(S);
+	    var length = keys.length;
+	    var j = 0;
+	    var key;
+	    while (length > j) {
+	      key = keys[j++];
+	      if (!descriptors || propertyIsEnumerable.call(S, key)) T[key] = S[key];
+	    }
+	  } return T;
+	} : nativeAssign;
+
+	// `Object.assign` method
+	// https://tc39.github.io/ecma262/#sec-object.assign
+	_export({ target: 'Object', stat: true, forced: Object.assign !== objectAssign }, {
+	  assign: objectAssign
+	});
+
 	function _classCallCheck(instance, Constructor) {
 	  if (!(instance instanceof Constructor)) {
 	    throw new TypeError("Cannot call a class as a function");
@@ -1011,6 +1061,12 @@
 	 */
 
 	var Utils = $.fn.bootstrapTable.utils;
+	$.extend($.fn.bootstrapTable.locales, {
+	  formatCopyRows: function formatCopyRows() {
+	    return 'Copy Rows';
+	  }
+	});
+	$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
 	$.extend($.fn.bootstrapTable.defaults.icons, {
 	  copy: {
 	    bootstrap3: 'glyphicon-copy icon-pencil',
@@ -1056,8 +1112,21 @@
 	  _createClass(_class, [{
 	    key: "initToolbar",
 	    value: function initToolbar() {
-	      var _get2,
-	          _this = this;
+	      var _get2;
+
+	      if (this.options.showCopyRows && this.header.stateField) {
+	        this.buttons = Object.assign(this.buttons, {
+	          copyRows: {
+	            'text': this.options.formatCopyRows(),
+	            'icon': this.options.icons.copy,
+	            'event': this.copyColumnsToClipboard,
+	            'attributes': {
+	              'aria-label': this.options.formatCopyRows(),
+	              'title': this.options.formatCopyRows()
+	            }
+	          }
+	        });
+	      }
 
 	      for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
 	        args[_key] = arguments[_key];
@@ -1065,33 +1134,28 @@
 
 	      (_get2 = _get(_getPrototypeOf(_class.prototype), "initToolbar", this)).call.apply(_get2, [this].concat(args));
 
-	      var $btnGroup = this.$toolbar.find('>.columns');
+	      this.$copyButton = this.$toolbar.find('>.columns [name="copyRows"]');
 
 	      if (this.options.showCopyRows && this.header.stateField) {
-	        this.$copyButton = $("\n        <button class=\"".concat(this.constants.buttonsClass, "\">\n        ").concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.copy), "\n        </button>\n      "));
-	        $btnGroup.append(this.$copyButton);
-	        this.$copyButton.click(function () {
-	          _this.copyColumnsToClipboard();
-	        });
 	        this.updateCopyButton();
 	      }
 	    }
 	  }, {
 	    key: "copyColumnsToClipboard",
 	    value: function copyColumnsToClipboard() {
-	      var _this2 = this;
+	      var _this = this;
 
 	      var rows = [];
 	      $.each(this.getSelections(), function (index, row) {
 	        var cols = [];
-	        $.each(_this2.options.columns[0], function (indy, column) {
-	          if (column.field !== _this2.header.stateField && (!_this2.options.copyWithHidden || _this2.options.copyWithHidden && column.visible)) {
+	        $.each(_this.options.columns[0], function (indy, column) {
+	          if (column.field !== _this.header.stateField && (!_this.options.copyWithHidden || _this.options.copyWithHidden && column.visible)) {
 	            if (row[column.field] !== null) {
-	              cols.push(Utils.calculateObjectValue(column, _this2.header.formatters[indy], [row[column.field], row, index], row[column.field]));
+	              cols.push(Utils.calculateObjectValue(column, _this.header.formatters[indy], [row[column.field], row, index], row[column.field]));
 	            }
 	          }
 	        });
-	        rows.push(cols.join(_this2.options.copyDelimiter));
+	        rows.push(cols.join(_this.options.copyDelimiter));
 	      });
 	      copyText(rows.join(this.options.copyNewline));
 	    }
@@ -1105,7 +1169,7 @@
 	  }, {
 	    key: "updateCopyButton",
 	    value: function updateCopyButton() {
-	      if (this.options.showCopyRows) {
+	      if (this.options.showCopyRows && this.header.stateField && this.$copyButton) {
 	        this.$copyButton.prop('disabled', !this.getSelections().length);
 	      }
 	    }