bootstrap-table-rails 1.16.0 → 1.18.1

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

@@ -4,7 +4,7 @@
 	(global = global || self, factory(global.jQuery));
 }(this, (function ($) { 'use strict';
 
-	$ = $ && $.hasOwnProperty('default') ? $['default'] : $;
+	$ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
 
 	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -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,29 @@
 
 	  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,
+	  addrPrefix: ''
+	});
 
 	$.BootstrapTable =
 	/*#__PURE__*/
@@ -1587,34 +1611,39 @@
 	      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');
+	        this.options.pageSize = +this.getDefaultOptionValue('pageSize', 'size');
+	        this.options.sortOrder = this.getDefaultOptionValue('sortOrder', 'order');
+	        this.options.sortName = this.getDefaultOptionValue('sortName', 'sort');
+	        this.options.searchText = this.getDefaultOptionValue('searchText', 'search');
 
-	        var _prefix = this.options.addrPrefix || ''; // 优先级排序: 用户指定值最优先, 未指定时从地址栏获取, 未获取到时采用默认值
-
+	        var _prefix = this.options.addrPrefix || '';
 
-	        this.options.pageNumber = +_GET("".concat(_prefix, "page")) || $.BootstrapTable.DEFAULTS.pageNumber;
-	        this.options.pageSize = +_GET("".concat(_prefix, "size")) || $.BootstrapTable.DEFAULTS.pageSize;
-	        this.options.sortOrder = _GET("".concat(_prefix, "order")) || $.BootstrapTable.DEFAULTS.sortOrder;
-	        this.options.sortName = _GET("".concat(_prefix, "sort")) || $.BootstrapTable.DEFAULTS.sortName;
-	        this.options.searchText = _GET("".concat(_prefix, "search")) || $.BootstrapTable.DEFAULTS.searchText;
 	        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++) {
@@ -1623,6 +1652,22 @@
 
 	      (_get2 = _get(_getPrototypeOf(_class.prototype), "init", this)).call.apply(_get2, [this].concat(args));
 	    }
+	    /*
+	     * Priority order:
+	     * The value specified by the user has the highest priority.
+	     * If it is not specified, it will be obtained from the address bar.
+	     * If it is not obtained, the default value will be used.
+	     */
+
+	  }, {
+	    key: "getDefaultOptionValue",
+	    value: function getDefaultOptionValue(optionName, prefixName) {
+	      if (this.options[optionName] !== $.BootstrapTable.DEFAULTS[optionName]) {
+	        return this.options[optionName];
+	      }
+
+	      return _GET("".concat(this.options.addrPrefix || '').concat(prefixName)) || $.BootstrapTable.DEFAULTS[optionName];
+	    }
 	  }]);
 
 	  return _class;

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

@@ -4,7 +4,7 @@
 	(global = global || self, factory(global.jQuery));
 }(this, (function ($) { 'use strict';
 
-	$ = $ && $.hasOwnProperty('default') ? $['default'] : $;
+	$ = $ && Object.prototype.hasOwnProperty.call($, 'default') ? $['default'] : $;
 
 	var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -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");
@@ -1001,7 +1051,8 @@
 	$.extend($.fn.bootstrapTable.defaults.icons, {
 	  autoRefresh: {
 	    bootstrap3: 'glyphicon-time icon-time',
-	    materialize: 'access_time'
+	    materialize: 'access_time',
+	    'bootstrap-table': 'icon-clock'
 	  }[$.fn.bootstrapTable.theme] || 'fa-clock'
 	});
 	$.extend($.fn.bootstrapTable.locales, {
@@ -1047,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",
@@ -1071,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;