bootstrap-table-rails 1.16.0 → 1.18.1

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

@@ -4,7 +4,7 @@
 	(global = global || self, global.BootstrapTable = 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 : {};
 
@@ -1994,6 +1994,15 @@
 	  parseInt: _parseInt
 	});
 
+	var MATCH = wellKnownSymbol('match');
+
+	// `IsRegExp` abstract operation
+	// https://tc39.github.io/ecma262/#sec-isregexp
+	var isRegexp = function (it) {
+	  var isRegExp;
+	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classofRaw(it) == 'RegExp');
+	};
+
 	// `RegExp.prototype.flags` getter implementation
 	// https://tc39.github.io/ecma262/#sec-get-regexp.prototype.flags
 	var regexpFlags = function () {
@@ -2033,6 +2042,101 @@
 		BROKEN_CARET: BROKEN_CARET
 	};
 
+	var SPECIES$3 = wellKnownSymbol('species');
+
+	var setSpecies = function (CONSTRUCTOR_NAME) {
+	  var Constructor = getBuiltIn(CONSTRUCTOR_NAME);
+	  var defineProperty = objectDefineProperty.f;
+
+	  if (descriptors && Constructor && !Constructor[SPECIES$3]) {
+	    defineProperty(Constructor, SPECIES$3, {
+	      configurable: true,
+	      get: function () { return this; }
+	    });
+	  }
+	};
+
+	var defineProperty$5 = objectDefineProperty.f;
+	var getOwnPropertyNames$1 = objectGetOwnPropertyNames.f;
+
+
+
+
+
+	var setInternalState$2 = internalState.set;
+
+
+
+	var MATCH$1 = wellKnownSymbol('match');
+	var NativeRegExp = global_1.RegExp;
+	var RegExpPrototype = NativeRegExp.prototype;
+	var re1 = /a/g;
+	var re2 = /a/g;
+
+	// "new" should create a new object, old webkit bug
+	var CORRECT_NEW = new NativeRegExp(re1) !== re1;
+
+	var UNSUPPORTED_Y$1 = regexpStickyHelpers.UNSUPPORTED_Y;
+
+	var FORCED$4 = descriptors && isForced_1('RegExp', (!CORRECT_NEW || UNSUPPORTED_Y$1 || fails(function () {
+	  re2[MATCH$1] = false;
+	  // RegExp constructor can alter flags and IsRegExp works correct with @@match
+	  return NativeRegExp(re1) != re1 || NativeRegExp(re2) == re2 || NativeRegExp(re1, 'i') != '/a/i';
+	})));
+
+	// `RegExp` constructor
+	// https://tc39.github.io/ecma262/#sec-regexp-constructor
+	if (FORCED$4) {
+	  var RegExpWrapper = function RegExp(pattern, flags) {
+	    var thisIsRegExp = this instanceof RegExpWrapper;
+	    var patternIsRegExp = isRegexp(pattern);
+	    var flagsAreUndefined = flags === undefined;
+	    var sticky;
+
+	    if (!thisIsRegExp && patternIsRegExp && pattern.constructor === RegExpWrapper && flagsAreUndefined) {
+	      return pattern;
+	    }
+
+	    if (CORRECT_NEW) {
+	      if (patternIsRegExp && !flagsAreUndefined) pattern = pattern.source;
+	    } else if (pattern instanceof RegExpWrapper) {
+	      if (flagsAreUndefined) flags = regexpFlags.call(pattern);
+	      pattern = pattern.source;
+	    }
+
+	    if (UNSUPPORTED_Y$1) {
+	      sticky = !!flags && flags.indexOf('y') > -1;
+	      if (sticky) flags = flags.replace(/y/g, '');
+	    }
+
+	    var result = inheritIfRequired(
+	      CORRECT_NEW ? new NativeRegExp(pattern, flags) : NativeRegExp(pattern, flags),
+	      thisIsRegExp ? this : RegExpPrototype,
+	      RegExpWrapper
+	    );
+
+	    if (UNSUPPORTED_Y$1 && sticky) setInternalState$2(result, { sticky: sticky });
+
+	    return result;
+	  };
+	  var proxy = function (key) {
+	    key in RegExpWrapper || defineProperty$5(RegExpWrapper, key, {
+	      configurable: true,
+	      get: function () { return NativeRegExp[key]; },
+	      set: function (it) { NativeRegExp[key] = it; }
+	    });
+	  };
+	  var keys$2 = getOwnPropertyNames$1(NativeRegExp);
+	  var index = 0;
+	  while (keys$2.length > index) proxy(keys$2[index++]);
+	  RegExpPrototype.constructor = RegExpWrapper;
+	  RegExpWrapper.prototype = RegExpPrototype;
+	  redefine(global_1, 'RegExp', RegExpWrapper);
+	}
+
+	// https://tc39.github.io/ecma262/#sec-get-regexp-@@species
+	setSpecies('RegExp');
+
 	var nativeExec = RegExp.prototype.exec;
 	// This always refers to the native implementation, because the
 	// String#replace polyfill uses ./fix-regexp-well-known-symbol-logic.js,
@@ -2049,18 +2153,18 @@
 	  return re1.lastIndex !== 0 || re2.lastIndex !== 0;
 	})();
 
-	var UNSUPPORTED_Y$1 = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
+	var UNSUPPORTED_Y$2 = regexpStickyHelpers.UNSUPPORTED_Y || regexpStickyHelpers.BROKEN_CARET;
 
 	// nonparticipating capturing group, copied from es5-shim's String#split patch.
 	var NPCG_INCLUDED = /()??/.exec('')[1] !== undefined;
 
-	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$1;
+	var PATCH = UPDATES_LAST_INDEX_WRONG || NPCG_INCLUDED || UNSUPPORTED_Y$2;
 
 	if (PATCH) {
 	  patchedExec = function exec(str) {
 	    var re = this;
 	    var lastIndex, reCopy, match, i;
-	    var sticky = UNSUPPORTED_Y$1 && re.sticky;
+	    var sticky = UNSUPPORTED_Y$2 && re.sticky;
 	    var flags = regexpFlags.call(re);
 	    var source = re.source;
 	    var charsAdded = 0;
@@ -2122,8 +2226,8 @@
 	});
 
 	var TO_STRING = 'toString';
-	var RegExpPrototype = RegExp.prototype;
-	var nativeToString = RegExpPrototype[TO_STRING];
+	var RegExpPrototype$1 = RegExp.prototype;
+	var nativeToString = RegExpPrototype$1[TO_STRING];
 
 	var NOT_GENERIC = fails(function () { return nativeToString.call({ source: 'a', flags: 'b' }) != '/a/b'; });
 	// FF44- RegExp#toString has a wrong name
@@ -2136,27 +2240,18 @@
 	    var R = anObject(this);
 	    var p = String(R.source);
 	    var rf = R.flags;
-	    var f = String(rf === undefined && R instanceof RegExp && !('flags' in RegExpPrototype) ? regexpFlags.call(R) : rf);
+	    var f = String(rf === undefined && R instanceof RegExp && !('flags' in RegExpPrototype$1) ? regexpFlags.call(R) : rf);
 	    return '/' + p + '/' + f;
 	  }, { unsafe: true });
 	}
 
-	var MATCH = wellKnownSymbol('match');
-
-	// `IsRegExp` abstract operation
-	// https://tc39.github.io/ecma262/#sec-isregexp
-	var isRegexp = function (it) {
-	  var isRegExp;
-	  return isObject(it) && ((isRegExp = it[MATCH]) !== undefined ? !!isRegExp : classofRaw(it) == 'RegExp');
-	};
-
 	var notARegexp = function (it) {
 	  if (isRegexp(it)) {
 	    throw TypeError("The method doesn't accept regular expressions");
 	  } return it;
 	};
 
-	var MATCH$1 = wellKnownSymbol('match');
+	var MATCH$2 = wellKnownSymbol('match');
 
 	var correctIsRegexpLogic = function (METHOD_NAME) {
 	  var regexp = /./;
@@ -2164,7 +2259,7 @@
 	    '/./'[METHOD_NAME](regexp);
 	  } catch (e) {
 	    try {
-	      regexp[MATCH$1] = false;
+	      regexp[MATCH$2] = false;
 	      return '/./'[METHOD_NAME](regexp);
 	    } catch (f) { /* empty */ }
 	  } return false;
@@ -2209,13 +2304,13 @@
 
 
 	var STRING_ITERATOR = 'String Iterator';
-	var setInternalState$2 = internalState.set;
+	var setInternalState$3 = internalState.set;
 	var getInternalState$2 = internalState.getterFor(STRING_ITERATOR);
 
 	// `String.prototype[@@iterator]` method
 	// https://tc39.github.io/ecma262/#sec-string.prototype-@@iterator
 	defineIterator(String, 'String', function (iterated) {
-	  setInternalState$2(this, {
+	  setInternalState$3(this, {
 	    type: STRING_ITERATOR,
 	    string: String(iterated),
 	    index: 0
@@ -2233,7 +2328,7 @@
 	  return { value: point, done: false };
 	});
 
-	var SPECIES$3 = wellKnownSymbol('species');
+	var SPECIES$4 = wellKnownSymbol('species');
 
 	var REPLACE_SUPPORTS_NAMED_GROUPS = !fails(function () {
 	  // #replace needs built-in support for named groups.
@@ -2287,7 +2382,7 @@
 	      // RegExp[@@split] doesn't call the regex's exec method, but first creates
 	      // a new one. We need to return the patched regex when creating the new one.
 	      re.constructor = {};
-	      re.constructor[SPECIES$3] = function () { return re; };
+	      re.constructor[SPECIES$4] = function () { return re; };
 	      re.flags = '';
 	      re[SYMBOL] = /./[SYMBOL];
 	    }
@@ -2515,14 +2610,14 @@
 	  ];
 	});
 
-	var SPECIES$4 = wellKnownSymbol('species');
+	var SPECIES$5 = wellKnownSymbol('species');
 
 	// `SpeciesConstructor` abstract operation
 	// https://tc39.github.io/ecma262/#sec-speciesconstructor
 	var speciesConstructor = function (O, defaultConstructor) {
 	  var C = anObject(O).constructor;
 	  var S;
-	  return C === undefined || (S = anObject(C)[SPECIES$4]) == undefined ? defaultConstructor : aFunction$1(S);
+	  return C === undefined || (S = anObject(C)[SPECIES$5]) == undefined ? defaultConstructor : aFunction$1(S);
 	};
 
 	var arrayPush = [].push;
@@ -2851,7 +2946,9 @@
 	  throw new TypeError("Invalid attempt to destructure non-iterable instance");
 	}
 
-	var VERSION = '1.16.0';
+	/* eslint-disable no-unused-vars */
+
+	var VERSION = '1.18.1';
 	var bootstrapVersion = 4;
 
 	try {
@@ -2864,6 +2961,16 @@
 	} catch (e) {// ignore
 	}
 
+	try {
+	  // eslint-disable-next-line no-undef
+	  var _rawVersion = bootstrap.Tooltip.VERSION;
+
+	  if (_rawVersion !== undefined) {
+	    bootstrapVersion = parseInt(_rawVersion, 10);
+	  }
+	} catch (e) {// ignore
+	}
+
 	var CONSTANTS = {
 	  3: {
 	    iconsPrefix: 'glyphicon',
@@ -2956,11 +3063,58 @@
 	      searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
 	      searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
 	    }
+	  },
+	  5: {
+	    iconsPrefix: 'fa',
+	    icons: {
+	      paginationSwitchDown: 'fa-caret-square-down',
+	      paginationSwitchUp: 'fa-caret-square-up',
+	      refresh: 'fa-sync',
+	      toggleOff: 'fa-toggle-off',
+	      toggleOn: 'fa-toggle-on',
+	      columns: 'fa-th-list',
+	      detailOpen: 'fa-plus',
+	      detailClose: 'fa-minus',
+	      fullscreen: 'fa-arrows-alt',
+	      search: 'fa-search',
+	      clearSearch: 'fa-trash'
+	    },
+	    classes: {
+	      buttonsPrefix: 'btn',
+	      buttons: 'secondary',
+	      buttonsGroup: 'btn-group',
+	      buttonsDropdown: 'btn-group',
+	      pull: 'float',
+	      inputGroup: 'btn-group',
+	      inputPrefix: 'form-control-',
+	      input: 'form-control',
+	      paginationDropdown: 'btn-group dropdown',
+	      dropup: 'dropup',
+	      dropdownActive: 'active',
+	      paginationActive: 'active',
+	      buttonActive: 'active'
+	    },
+	    html: {
+	      toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-right">', '</div>'],
+	      toolbarDropdownItem: '<label class="dropdown-item dropdown-item-marker">%s</label>',
+	      pageDropdown: ['<div class="dropdown-menu">', '</div>'],
+	      pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
+	      toolbarDropdownSeparator: '<div class="dropdown-divider"></div>',
+	      dropdownCaret: '<span class="caret"></span>',
+	      pagination: ['<ul class="pagination%s">', '</ul>'],
+	      paginationItem: '<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',
+	      icon: '<i class="%s %s"></i>',
+	      inputGroup: '<div class="input-group">%s<div class="input-group-append">%s</div></div>',
+	      searchInput: '<input class="%s%s" type="text" placeholder="%s">',
+	      searchButton: '<button class="%s" type="button" name="search" title="%s">%s %s</button>',
+	      searchClearButton: '<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'
+	    }
 	  }
 	}[bootstrapVersion];
 	var DEFAULTS = {
 	  height: undefined,
 	  classes: 'table table-bordered table-hover',
+	  buttons: {},
 	  theadClasses: '',
 	  headerStyle: function headerStyle(column) {
 	    return {};
@@ -2979,7 +3133,8 @@
 	  sortClass: undefined,
 	  silentSort: true,
 	  sortName: undefined,
-	  sortOrder: 'asc',
+	  sortOrder: undefined,
+	  sortReset: false,
 	  sortStable: false,
 	  rememberOrder: false,
 	  serverSort: true,
@@ -3004,8 +3159,9 @@
 	  totalField: 'total',
 	  totalNotFilteredField: 'totalNotFiltered',
 	  dataField: 'rows',
+	  footerField: 'footer',
 	  pagination: false,
-	  onlyInfoPagination: false,
+	  paginationParts: ['pageInfo', 'pageSize', 'pageList'],
 	  showExtendedPagination: false,
 	  paginationLoop: true,
 	  sidePagination: 'client',
@@ -3030,8 +3186,10 @@
 	  paginationUseIntermediate: false,
 	  // Calculate intermediate pages for quick access
 	  search: false,
+	  searchHighlight: false,
 	  searchOnEnterKey: false,
 	  strictSearch: false,
+	  searchSelector: false,
 	  visibleSearch: false,
 	  showButtonIcons: true,
 	  showButtonText: false,
@@ -3047,6 +3205,7 @@
 	  footerStyle: function footerStyle(column) {
 	    return {};
 	  },
+	  searchAccentNeutralise: false,
 	  showColumns: false,
 	  showColumnsToggleAll: false,
 	  showColumnsSearch: false,
@@ -3076,6 +3235,7 @@
 	  detailView: false,
 	  detailViewIcon: true,
 	  detailViewByClick: false,
+	  detailViewAlign: 'left',
 	  detailFormatter: function detailFormatter(index, row) {
 	    return '';
 	  },
@@ -3090,10 +3250,13 @@
 	  buttonsPrefix: CONSTANTS.classes.buttonsPrefix,
 	  buttonsClass: CONSTANTS.classes.buttons,
 	  icons: CONSTANTS.icons,
-	  html: CONSTANTS.html,
 	  iconSize: undefined,
 	  iconsPrefix: CONSTANTS.iconsPrefix,
 	  // glyphicon or fa(font-awesome)
+	  loadingFontSize: 'auto',
+	  loadingTemplate: function loadingTemplate(loadingMessage) {
+	    return "<span class=\"loading-wrap\">\n      <span class=\"loading-text\">".concat(loadingMessage, "</span>\n      <span class=\"animation-wrap\"><span class=\"animation-dot\"></span></span>\n      </span>\n    ");
+	  },
 	  onAll: function onAll(name, args) {
 	    return false;
 	  },
@@ -3252,7 +3415,7 @@
 	  field: undefined,
 	  title: undefined,
 	  titleTooltip: undefined,
-	  'class': undefined,
+	  class: undefined,
 	  width: undefined,
 	  widthUnit: 'px',
 	  rowspan: undefined,
@@ -3284,10 +3447,11 @@
 	  footerFormatter: undefined,
 	  detailFormatter: undefined,
 	  searchFormatter: true,
+	  searchHighlightFormatter: false,
 	  escape: false,
 	  events: undefined
 	};
-	var METHODS = ['getOptions', 'refreshOptions', 'getData', 'getSelections', 'getAllSelections', 'load', 'append', 'prepend', 'remove', 'removeAll', 'insertRow', 'updateRow', 'getRowByUniqueId', 'updateByUniqueId', 'removeByUniqueId', 'updateCell', 'updateCellByUniqueId', 'showRow', 'hideRow', 'getHiddenRows', 'showColumn', 'hideColumn', 'getVisibleColumns', 'getHiddenColumns', 'showAllColumns', 'hideAllColumns', 'mergeCells', 'checkAll', 'uncheckAll', 'checkInvert', 'check', 'uncheck', 'checkBy', 'uncheckBy', 'refresh', 'destroy', 'resetView', 'showLoading', 'hideLoading', 'togglePagination', 'toggleFullscreen', 'toggleView', 'resetSearch', 'filterBy', 'scrollTo', 'getScrollPosition', 'selectPage', 'prevPage', 'nextPage', 'toggleDetailView', 'expandRow', 'collapseRow', 'expandAllRows', 'collapseAllRows', 'updateColumnTitle', 'updateFormatText'];
+	var METHODS = ['getOptions', 'refreshOptions', 'getData', 'getSelections', 'load', 'append', 'prepend', 'remove', 'removeAll', 'insertRow', 'updateRow', 'getRowByUniqueId', 'updateByUniqueId', 'removeByUniqueId', 'updateCell', 'updateCellByUniqueId', 'showRow', 'hideRow', 'getHiddenRows', 'showColumn', 'hideColumn', 'getVisibleColumns', 'getHiddenColumns', 'showAllColumns', 'hideAllColumns', 'mergeCells', 'checkAll', 'uncheckAll', 'checkInvert', 'check', 'uncheck', 'checkBy', 'uncheckBy', 'refresh', 'destroy', 'resetView', 'showLoading', 'hideLoading', 'togglePagination', 'toggleFullscreen', 'toggleView', 'resetSearch', 'filterBy', 'scrollTo', 'getScrollPosition', 'selectPage', 'prevPage', 'nextPage', 'toggleDetailView', 'expandRow', 'collapseRow', 'expandRowByUniqueId', 'collapseRowByUniqueId', 'expandAllRows', 'collapseAllRows', 'updateColumnTitle', 'updateFormatText'];
 	var EVENTS = {
 	  'all.bs.table': 'onAll',
 	  'click-row.bs.table': 'onClickRow',
@@ -3343,7 +3507,78 @@
 	  }
 	});
 
+	var getOwnPropertyDescriptor$3 = objectGetOwnPropertyDescriptor.f;
+
+
+
+
+
+
+	var nativeEndsWith = ''.endsWith;
+	var min$5 = Math.min;
+
+	var CORRECT_IS_REGEXP_LOGIC = correctIsRegexpLogic('endsWith');
+	// https://github.com/zloirock/core-js/pull/702
+	var MDN_POLYFILL_BUG =  !CORRECT_IS_REGEXP_LOGIC && !!function () {
+	  var descriptor = getOwnPropertyDescriptor$3(String.prototype, 'endsWith');
+	  return descriptor && !descriptor.writable;
+	}();
+
+	// `String.prototype.endsWith` method
+	// https://tc39.github.io/ecma262/#sec-string.prototype.endswith
+	_export({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG && !CORRECT_IS_REGEXP_LOGIC }, {
+	  endsWith: function endsWith(searchString /* , endPosition = @length */) {
+	    var that = String(requireObjectCoercible(this));
+	    notARegexp(searchString);
+	    var endPosition = arguments.length > 1 ? arguments[1] : undefined;
+	    var len = toLength(that.length);
+	    var end = endPosition === undefined ? len : min$5(toLength(endPosition), len);
+	    var search = String(searchString);
+	    return nativeEndsWith
+	      ? nativeEndsWith.call(that, search, end)
+	      : that.slice(end - search.length, end) === search;
+	  }
+	});
+
+	var getOwnPropertyDescriptor$4 = objectGetOwnPropertyDescriptor.f;
+
+
+
+
+
+
+	var nativeStartsWith = ''.startsWith;
+	var min$6 = Math.min;
+
+	var CORRECT_IS_REGEXP_LOGIC$1 = correctIsRegexpLogic('startsWith');
+	// https://github.com/zloirock/core-js/pull/702
+	var MDN_POLYFILL_BUG$1 =  !CORRECT_IS_REGEXP_LOGIC$1 && !!function () {
+	  var descriptor = getOwnPropertyDescriptor$4(String.prototype, 'startsWith');
+	  return descriptor && !descriptor.writable;
+	}();
+
+	// `String.prototype.startsWith` method
+	// https://tc39.github.io/ecma262/#sec-string.prototype.startswith
+	_export({ target: 'String', proto: true, forced: !MDN_POLYFILL_BUG$1 && !CORRECT_IS_REGEXP_LOGIC$1 }, {
+	  startsWith: function startsWith(searchString /* , position = 0 */) {
+	    var that = String(requireObjectCoercible(this));
+	    notARegexp(searchString);
+	    var index = toLength(min$6(arguments.length > 1 ? arguments[1] : undefined, that.length));
+	    var search = String(searchString);
+	    return nativeStartsWith
+	      ? nativeStartsWith.call(that, search, index)
+	      : that.slice(index, index + search.length) === search;
+	  }
+	});
+
 	var Utils = {
+	  getSearchInput: function getSearchInput(that) {
+	    if (typeof that.options.searchSelector === 'string') {
+	      return $(that.options.searchSelector);
+	    }
+
+	    return that.$toolbar.find('.search input');
+	  },
 	  // it only does '%s', and return '' when arguments are undefined
 	  sprintf: function sprintf(_str) {
 	    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
@@ -3366,6 +3601,9 @@
 
 	    return flag ? str : '';
 	  },
+	  isObject: function isObject(val) {
+	    return val instanceof Object && !Array.isArray(val);
+	  },
 	  isEmptyObject: function isEmptyObject() {
 	    var obj = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	    return Object.entries(obj).length === 0 && obj.constructor === Object;
@@ -3463,12 +3701,10 @@
 	            r.colspanGroup = r.colspan;
 	          }
 
-	          for (var k = 0; k < rowspan; k++) {
-	            flag[_i + k][index] = true;
-	          }
-
-	          for (var _k = 0; _k < colspan; _k++) {
-	            flag[_i][index + _k] = true;
+	          for (var _j = 0; _j < rowspan; _j++) {
+	            for (var k = 0; k < colspan; k++) {
+	              flag[_i + _j][index + k] = true;
+	            }
 	          }
 	        }
 	      } catch (err) {
@@ -3487,6 +3723,13 @@
 	      }
 	    }
 	  },
+	  normalizeAccent: function normalizeAccent(value) {
+	    if (typeof value !== 'string') {
+	      return value;
+	    }
+
+	    return value.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
+	  },
 	  updateFieldGroup: function updateFieldGroup(columns) {
 	    var _ref;
 
@@ -3654,6 +3897,13 @@
 
 	    return text;
 	  },
+	  unescapeHTML: function unescapeHTML(text) {
+	    if (typeof text === 'string') {
+	      return text.replace(/&amp;/g, '&').replace(/&lt;/g, '<').replace(/&gt;/g, '>').replace(/&quot;/g, '"').replace(/&#039;/g, '\'').replace(/&#x60;/g, '`');
+	    }
+
+	    return text;
+	  },
 	  getRealDataAttr: function getRealDataAttr(dataAttr) {
 	    for (var _i3 = 0, _Object$entries = Object.entries(dataAttr); _i3 < _Object$entries.length; _i3++) {
 	      var _Object$entries$_i = _slicedToArray(_Object$entries[_i3], 2),
@@ -3743,14 +3993,17 @@
 	    var data = [];
 	    var m = [];
 	    $els.each(function (y, el) {
+	      var $el = $(el);
 	      var row = {}; // save tr's id, class and data-* attributes
 
-	      row._id = $(el).attr('id');
-	      row._class = $(el).attr('class');
-	      row._data = _this.getRealDataAttr($(el).data());
-	      $(el).find('>td,>th').each(function (_x, el) {
-	        var cspan = +$(el).attr('colspan') || 1;
-	        var rspan = +$(el).attr('rowspan') || 1;
+	      row._id = $el.attr('id');
+	      row._class = $el.attr('class');
+	      row._data = _this.getRealDataAttr($el.data());
+	      row._style = $el.attr('style');
+	      $el.find('>td,>th').each(function (_x, el) {
+	        var $el = $(el);
+	        var cspan = +$el.attr('colspan') || 1;
+	        var rspan = +$el.attr('rowspan') || 1;
 	        var x = _x; // skip already occupied cells in current row
 
 	        for (; m[y] && m[y][x]; x++) {} // ignore
@@ -3769,14 +4022,15 @@
 	        }
 
 	        var field = columns[x].field;
-	        row[field] = $(el).html().trim(); // save td's id, class and data-* attributes
-
-	        row["_".concat(field, "_id")] = $(el).attr('id');
-	        row["_".concat(field, "_class")] = $(el).attr('class');
-	        row["_".concat(field, "_rowspan")] = $(el).attr('rowspan');
-	        row["_".concat(field, "_colspan")] = $(el).attr('colspan');
-	        row["_".concat(field, "_title")] = $(el).attr('title');
-	        row["_".concat(field, "_data")] = _this.getRealDataAttr($(el).data());
+	        row[field] = $el.html().trim(); // save td's id, class and data-* attributes
+
+	        row["_".concat(field, "_id")] = $el.attr('id');
+	        row["_".concat(field, "_class")] = $el.attr('class');
+	        row["_".concat(field, "_rowspan")] = $el.attr('rowspan');
+	        row["_".concat(field, "_colspan")] = $el.attr('colspan');
+	        row["_".concat(field, "_title")] = $el.attr('title');
+	        row["_".concat(field, "_data")] = _this.getRealDataAttr($el.data());
+	        row["_".concat(field, "_style")] = $el.attr('style');
 	      });
 	      data.push(row);
 	    });
@@ -3828,10 +4082,57 @@
 
 	    return order;
 	  },
-	  getResizeEventName: function getResizeEventName() {
-	    var id = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+	  getEventName: function getEventName(eventPrefix) {
+	    var id = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
 	    id = id || "".concat(+new Date()).concat(~~(Math.random() * 1000000));
-	    return "resize.bootstrap-table-".concat(id);
+	    return "".concat(eventPrefix, "-").concat(id);
+	  },
+	  hasDetailViewIcon: function hasDetailViewIcon(options) {
+	    return options.detailView && options.detailViewIcon && !options.cardView;
+	  },
+	  getDetailViewIndexOffset: function getDetailViewIndexOffset(options) {
+	    return this.hasDetailViewIcon(options) && options.detailViewAlign !== 'right' ? 1 : 0;
+	  },
+	  checkAutoMergeCells: function checkAutoMergeCells(data) {
+	    var _iteratorNormalCompletion9 = true;
+	    var _didIteratorError9 = false;
+	    var _iteratorError9 = undefined;
+
+	    try {
+	      for (var _iterator9 = data[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+	        var row = _step9.value;
+
+	        for (var _i4 = 0, _Object$keys = Object.keys(row); _i4 < _Object$keys.length; _i4++) {
+	          var key = _Object$keys[_i4];
+
+	          if (key.startsWith('_') && (key.endsWith('_rowspan') || key.endsWith('_colspan'))) {
+	            return true;
+	          }
+	        }
+	      }
+	    } catch (err) {
+	      _didIteratorError9 = true;
+	      _iteratorError9 = err;
+	    } finally {
+	      try {
+	        if (!_iteratorNormalCompletion9 && _iterator9.return != null) {
+	          _iterator9.return();
+	        }
+	      } finally {
+	        if (_didIteratorError9) {
+	          throw _iteratorError9;
+	        }
+	      }
+	    }
+
+	    return false;
+	  },
+	  deepCopy: function deepCopy(arg) {
+	    if (arg === undefined) {
+	      return arg;
+	    }
+
+	    return $.extend(true, Array.isArray(arg) ? [] : {}, arg);
 	  }
 	};
 
@@ -3998,7 +4299,6 @@
 	    this.$el_ = this.$el.clone();
 	    this.timeoutId_ = 0;
 	    this.timeoutFooter_ = 0;
-	    this.init();
 	  }
 
 	  _createClass(BootstrapTable, [{
@@ -4025,6 +4325,15 @@
 	      this.constants.theme = $.fn.bootstrapTable.theme;
 	      var buttonsPrefix = opts.buttonsPrefix ? "".concat(opts.buttonsPrefix, "-") : '';
 	      this.constants.buttonsClass = [opts.buttonsPrefix, buttonsPrefix + opts.buttonsClass, Utils.sprintf("".concat(buttonsPrefix, "%s"), opts.iconSize)].join(' ').trim();
+	      this.buttons = Utils.calculateObjectValue(this, opts.buttons, [], {});
+
+	      if (_typeof(this.buttons) !== 'object') {
+	        this.buttons = {};
+	      }
+
+	      if (typeof opts.icons === 'string') {
+	        opts.icons = Utils.calculateObjectValue(null, opts.icons);
+	      }
 	    }
 	  }, {
 	    key: "initLocale",
@@ -4052,7 +4361,8 @@
 	    value: function initContainer() {
 	      var topPagination = ['top', 'both'].includes(this.options.paginationVAlign) ? '<div class="fixed-table-pagination clearfix"></div>' : '';
 	      var bottomPagination = ['bottom', 'both'].includes(this.options.paginationVAlign) ? '<div class="fixed-table-pagination"></div>' : '';
-	      this.$container = $("\n      <div class=\"bootstrap-table ".concat(this.constants.theme, "\">\n      <div class=\"fixed-table-toolbar\"></div>\n      ").concat(topPagination, "\n      <div class=\"fixed-table-container\">\n      <div class=\"fixed-table-header\"><table></table></div>\n      <div class=\"fixed-table-body\">\n      <div class=\"fixed-table-loading\">\n      <span class=\"loading-wrap\">\n      <span class=\"loading-text\">").concat(this.options.formatLoadingMessage(), "</span>\n      <span class=\"animation-wrap\"><span class=\"animation-dot\"></span></span>\n      </span>\n      </div>\n      </div>\n      <div class=\"fixed-table-footer\"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ").concat(bottomPagination, "\n      </div>\n    "));
+	      var loadingTemplate = Utils.calculateObjectValue(this.options, this.options.loadingTemplate, [this.options.formatLoadingMessage()]);
+	      this.$container = $("\n      <div class=\"bootstrap-table ".concat(this.constants.theme, "\">\n      <div class=\"fixed-table-toolbar\"></div>\n      ").concat(topPagination, "\n      <div class=\"fixed-table-container\">\n      <div class=\"fixed-table-header\"><table></table></div>\n      <div class=\"fixed-table-body\">\n      <div class=\"fixed-table-loading\">\n      ").concat(loadingTemplate, "\n      </div>\n      </div>\n      <div class=\"fixed-table-footer\"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ").concat(bottomPagination, "\n      </div>\n    "));
 	      this.$container.insertAfter(this.$el);
 	      this.$tableContainer = this.$container.find('.fixed-table-container');
 	      this.$tableHeader = this.$container.find('.fixed-table-header');
@@ -4102,23 +4412,35 @@
 	        this.$header.addClass(this.options.theadClasses);
 	      }
 
+	      this._headerTrClasses = [];
+	      this._headerTrStyles = [];
 	      this.$header.find('tr').each(function (i, el) {
+	        var $tr = $(el);
 	        var column = [];
-	        $(el).find('th').each(function (i, el) {
-	          // #2014: getFieldIndex and elsewhere assume this is string, causes issues if not
-	          if (typeof $(el).data('field') !== 'undefined') {
-	            $(el).data('field', "".concat($(el).data('field')));
+	        $tr.find('th').each(function (i, el) {
+	          var $th = $(el); // #2014: getFieldIndex and elsewhere assume this is string, causes issues if not
+
+	          if (typeof $th.data('field') !== 'undefined') {
+	            $th.data('field', "".concat($th.data('field')));
 	          }
 
 	          column.push($.extend({}, {
-	            title: $(el).html(),
-	            'class': $(el).attr('class'),
-	            titleTooltip: $(el).attr('title'),
-	            rowspan: $(el).attr('rowspan') ? +$(el).attr('rowspan') : undefined,
-	            colspan: $(el).attr('colspan') ? +$(el).attr('colspan') : undefined
-	          }, $(el).data()));
+	            title: $th.html(),
+	            class: $th.attr('class'),
+	            titleTooltip: $th.attr('title'),
+	            rowspan: $th.attr('rowspan') ? +$th.attr('rowspan') : undefined,
+	            colspan: $th.attr('colspan') ? +$th.attr('colspan') : undefined
+	          }, $th.data()));
 	        });
 	        columns.push(column);
+
+	        if ($tr.attr('class')) {
+	          _this._headerTrClasses.push($tr.attr('class'));
+	        }
+
+	        if ($tr.attr('style')) {
+	          _this._headerTrStyles.push($tr.attr('style'));
+	        }
 	      });
 
 	      if (!Array.isArray(this.options.columns[0])) {
@@ -4143,14 +4465,17 @@
 	      }); // if options.data is setting, do not process tbody and tfoot data
 
 	      if (!this.options.data.length) {
-	        this.options.data = Utils.trToData(this.columns, this.$el.find('>tbody>tr'));
+	        var htmlData = Utils.trToData(this.columns, this.$el.find('>tbody>tr'));
 
-	        if (this.options.data.length) {
+	        if (htmlData.length) {
+	          this.options.data = htmlData;
 	          this.fromHtml = true;
 	        }
 	      }
 
-	      this.footerData = Utils.trToData(this.columns, this.$el.find('>tfoot>tr'));
+	      if (!(this.options.pagination && this.options.sidePagination !== 'server')) {
+	        this.footerData = Utils.trToData(this.columns, this.$el.find('>tfoot>tr'));
+	      }
 
 	      if (this.footerData) {
 	        this.$el.find('tfoot').html('<tr></tr>');
@@ -4183,10 +4508,15 @@
 	      };
 	      Utils.updateFieldGroup(this.options.columns);
 	      this.options.columns.forEach(function (columns, i) {
-	        html.push('<tr>');
+	        html.push("<tr".concat(Utils.sprintf(' class="%s"', _this2._headerTrClasses[i]), " ").concat(Utils.sprintf(' style="%s"', _this2._headerTrStyles[i]), ">"));
+	        var detailViewTemplate = '';
+
+	        if (i === 0 && Utils.hasDetailViewIcon(_this2.options)) {
+	          detailViewTemplate = "<th class=\"detail\" rowspan=\"".concat(_this2.options.columns.length, "\">\n          <div class=\"fht-cell\"></div>\n          </th>");
+	        }
 
-	        if (i === 0 && !_this2.options.cardView && _this2.options.detailView && _this2.options.detailViewIcon) {
-	          html.push("<th class=\"detail\" rowspan=\"".concat(_this2.options.columns.length, "\">\n          <div class=\"fht-cell\"></div>\n          </th>\n        "));
+	        if (detailViewTemplate && _this2.options.detailViewAlign !== 'right') {
+	          html.push(detailViewTemplate);
 	        }
 
 	        columns.forEach(function (column, j) {
@@ -4274,6 +4604,11 @@
 	          html.push('</div>');
 	          html.push('</th>');
 	        });
+
+	        if (detailViewTemplate && _this2.options.detailViewAlign === 'right') {
+	          html.push(detailViewTemplate);
+	        }
+
 	        html.push('</tr>');
 	      });
 	      this.$header.html(html.join(''));
@@ -4303,7 +4638,7 @@
 	          }
 	        }
 	      });
-	      var resizeEvent = Utils.getResizeEventName(this.$el.attr('id'));
+	      var resizeEvent = Utils.getEventName('resize.bootstrap-table', this.$el.attr('id'));
 	      $(window).off(resizeEvent);
 
 	      if (!this.options.showHeader || this.options.cardView) {
@@ -4339,10 +4674,15 @@
 	      } else if (type === 'prepend') {
 	        this.options.data = [].concat(data).concat(this.options.data);
 	      } else {
-	        this.options.data = data || this.options.data;
+	        data = data || Utils.deepCopy(this.options.data);
+	        this.options.data = Array.isArray(data) ? data : data[this.options.dataField];
 	      }
 
-	      this.data = this.options.data;
+	      this.data = _toConsumableArray(this.options.data);
+
+	      if (this.options.sortReset) {
+	        this.unsortedData = _toConsumableArray(this.data);
+	      }
 
 	      if (this.options.sidePagination === 'server') {
 	        return;
@@ -4403,6 +4743,8 @@
 	            _this3.$el.find("tr td:nth-child(".concat(index + 1, ")")).addClass(_this3.options.sortClass);
 	          }, 250);
 	        }
+	      } else if (this.options.sortReset) {
+	        this.data = _toConsumableArray(this.unsortedData);
 	      }
 	    }
 	  }, {
@@ -4415,7 +4757,19 @@
 	      this.$header.add(this.$header_).find('span.order').remove();
 
 	      if (this.options.sortName === $this.data('field')) {
-	        this.options.sortOrder = this.options.sortOrder === 'asc' ? 'desc' : 'asc';
+	        var currentSortOrder = this.options.sortOrder;
+
+	        if (currentSortOrder === undefined) {
+	          this.options.sortOrder = 'asc';
+	        } else if (currentSortOrder === 'asc') {
+	          this.options.sortOrder = 'desc';
+	        } else if (this.options.sortOrder === 'desc') {
+	          this.options.sortOrder = this.options.sortReset ? undefined : 'asc';
+	        }
+
+	        if (this.options.sortOrder === undefined) {
+	          this.options.sortName = undefined;
+	        }
 	      } else {
 	        this.options.sortName = $this.data('field');
 
@@ -4464,67 +4818,156 @@
 
 	      html = ["<div class=\"".concat(['columns', "columns-".concat(opts.buttonsAlign), this.constants.classes.buttonsGroup, "".concat(this.constants.classes.pull, "-").concat(opts.buttonsAlign)].join(' '), "\">")];
 
-	      if (typeof opts.icons === 'string') {
-	        opts.icons = Utils.calculateObjectValue(null, opts.icons);
-	      }
+	      if (typeof opts.buttonsOrder === 'string') {
+	        opts.buttonsOrder = opts.buttonsOrder.replace(/\[|\]| |'/g, '').split(',');
+	      }
+
+	      this.buttons = Object.assign(this.buttons, {
+	        paginationSwitch: {
+	          text: opts.pagination ? opts.formatPaginationSwitchUp() : opts.formatPaginationSwitchDown(),
+	          icon: opts.pagination ? opts.icons.paginationSwitchDown : opts.icons.paginationSwitchUp,
+	          render: false,
+	          event: this.togglePagination,
+	          attributes: {
+	            'aria-label': opts.formatPaginationSwitch(),
+	            title: opts.formatPaginationSwitch()
+	          }
+	        },
+	        refresh: {
+	          text: opts.formatRefresh(),
+	          icon: opts.icons.refresh,
+	          render: false,
+	          event: this.refresh,
+	          attributes: {
+	            'aria-label': opts.formatRefresh(),
+	            title: opts.formatRefresh()
+	          }
+	        },
+	        toggle: {
+	          text: opts.formatToggle(),
+	          icon: opts.icons.toggleOff,
+	          render: false,
+	          event: this.toggleView,
+	          attributes: {
+	            'aria-label': opts.formatToggleOn(),
+	            title: opts.formatToggleOn()
+	          }
+	        },
+	        fullscreen: {
+	          text: opts.formatFullscreen(),
+	          icon: opts.icons.fullscreen,
+	          render: false,
+	          event: this.toggleFullscreen,
+	          attributes: {
+	            'aria-label': opts.formatFullscreen(),
+	            title: opts.formatFullscreen()
+	          }
+	        },
+	        columns: {
+	          render: false,
+	          html: function html() {
+	            var html = [];
+	            html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\" title=\"").concat(opts.formatColumns(), "\">\n            <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\"\n            aria-label=\"Columns\" title=\"").concat(opts.formatColumns(), "\">\n            ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n            ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n            ").concat(_this4.constants.html.dropdownCaret, "\n            </button>\n            ").concat(_this4.constants.html.toolbarDropdown[0]));
+
+	            if (opts.showColumnsSearch) {
+	              html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">', _this4.constants.classes.input, opts.formatSearch())));
+	              html.push(_this4.constants.html.toolbarDropdownSeparator);
+	            }
+
+	            if (opts.showColumnsToggleAll) {
+	              var allFieldsVisible = _this4.getVisibleColumns().length === _this4.columns.filter(function (column) {
+	                return !_this4.isSelectionColumn(column);
+	              }).length;
+
+	              html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>', allFieldsVisible ? 'checked="checked"' : '', opts.formatColumnsToggleAll())));
+	              html.push(_this4.constants.html.toolbarDropdownSeparator);
+	            }
+
+	            var visibleColumns = 0;
+
+	            _this4.columns.forEach(function (column) {
+	              if (column.visible) {
+	                visibleColumns++;
+	              }
+	            });
+
+	            _this4.columns.forEach(function (column, i) {
+	              if (_this4.isSelectionColumn(column)) {
+	                return;
+	              }
 
-	      var buttonsHtml = {
-	        paginationSwitch: "<button class=\"".concat(this.constants.buttonsClass, "\" type=\"button\" name=\"paginationSwitch\"\n        aria-label=\"Pagination Switch\" title=\"").concat(opts.formatPaginationSwitch(), "\">\n        ").concat(opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.paginationSwitchDown) : '', "\n        ").concat(opts.showButtonText ? opts.formatPaginationSwitchUp() : '', "\n        </button>"),
-	        refresh: "<button class=\"".concat(this.constants.buttonsClass, "\" type=\"button\" name=\"refresh\"\n        aria-label=\"Refresh\" title=\"").concat(opts.formatRefresh(), "\">\n        ").concat(opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.refresh) : '', "\n        ").concat(opts.showButtonText ? opts.formatRefresh() : '', "\n        </button>"),
-	        toggle: "<button class=\"".concat(this.constants.buttonsClass, "\" type=\"button\" name=\"toggle\"\n        aria-label=\"Toggle\" title=\"").concat(opts.formatToggle(), "\">\n        ").concat(opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.toggleOff) : '', "\n        ").concat(opts.showButtonText ? opts.formatToggleOn() : '', "\n        </button>"),
-	        fullscreen: "<button class=\"".concat(this.constants.buttonsClass, "\" type=\"button\" name=\"fullscreen\"\n        aria-label=\"Fullscreen\" title=\"").concat(opts.formatFullscreen(), "\">\n        ").concat(opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.fullscreen) : '', "\n        ").concat(opts.showButtonText ? opts.formatFullscreen() : '', "\n        </button>"),
-	        columns: function () {
-	          var html = [];
-	          html.push("<div class=\"keep-open ".concat(_this4.constants.classes.buttonsDropdown, "\" title=\"").concat(opts.formatColumns(), "\">\n          <button class=\"").concat(_this4.constants.buttonsClass, " dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\"\n          aria-label=\"Columns\" title=\"").concat(opts.formatColumns(), "\">\n          ").concat(opts.showButtonIcons ? Utils.sprintf(_this4.constants.html.icon, opts.iconsPrefix, opts.icons.columns) : '', "\n          ").concat(opts.showButtonText ? opts.formatColumns() : '', "\n          ").concat(_this4.constants.html.dropdownCaret, "\n          </button>\n          ").concat(_this4.constants.html.toolbarDropdown[0]));
+	              if (opts.cardView && !column.cardVisible) {
+	                return;
+	              }
+
+	              var checked = column.visible ? ' checked="checked"' : '';
+	              var disabled = visibleColumns <= opts.minimumCountColumns && checked ? ' disabled="disabled"' : '';
+
+	              if (column.switchable) {
+	                html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>', column.field, i, checked, disabled, column.title)));
+	                switchableCount++;
+	              }
+	            });
 
-	          if (opts.showColumnsSearch) {
-	            html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="text" class="%s" id="columnsSearch" placeholder="%s" autocomplete="off">', _this4.constants.classes.input, opts.formatSearch())));
-	            html.push(_this4.constants.html.toolbarDropdownSeparator);
+	            html.push(_this4.constants.html.toolbarDropdown[1], '</div>');
+	            return html.join('');
 	          }
+	        }
+	      });
+	      var buttonsHtml = {};
+
+	      for (var _i2 = 0, _Object$entries2 = Object.entries(this.buttons); _i2 < _Object$entries2.length; _i2++) {
+	        var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i2], 2),
+	            buttonName = _Object$entries2$_i[0],
+	            buttonConfig = _Object$entries2$_i[1];
 
-	          if (opts.showColumnsToggleAll) {
-	            var allFieldsVisible = _this4.getVisibleColumns().length === _this4.columns.filter(function (column) {
-	              return !_this4.isSelectionColumn(column);
-	            }).length;
+	        var buttonHtml = void 0;
 
-	            html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>', allFieldsVisible ? 'checked="checked"' : '', opts.formatColumnsToggleAll())));
-	            html.push(_this4.constants.html.toolbarDropdownSeparator);
+	        if (buttonConfig.hasOwnProperty('html')) {
+	          if (typeof buttonConfig.html === 'function') {
+	            buttonHtml = buttonConfig.html();
+	          } else if (typeof buttonConfig.html === 'string') {
+	            buttonHtml = buttonConfig.html;
 	          }
+	        } else {
+	          buttonHtml = "<button class=\"".concat(this.constants.buttonsClass, "\" type=\"button\" name=\"").concat(buttonName, "\"");
 
-	          var visibleColumns = 0;
+	          if (buttonConfig.hasOwnProperty('attributes')) {
+	            for (var _i4 = 0, _Object$entries4 = Object.entries(buttonConfig.attributes); _i4 < _Object$entries4.length; _i4++) {
+	              var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i4], 2),
+	                  attributeName = _Object$entries4$_i[0],
+	                  value = _Object$entries4$_i[1];
 
-	          _this4.columns.forEach(function (column, i) {
-	            if (column.visible) {
-	              visibleColumns++;
+	              buttonHtml += " ".concat(attributeName, "=\"").concat(value, "\"");
 	            }
-	          });
+	          }
 
-	          _this4.columns.forEach(function (column, i) {
-	            if (_this4.isSelectionColumn(column)) {
-	              return;
-	            }
+	          buttonHtml += '>';
 
-	            if (opts.cardView && !column.cardVisible) {
-	              return;
-	            }
+	          if (opts.showButtonIcons && buttonConfig.hasOwnProperty('icon')) {
+	            buttonHtml += "".concat(Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, buttonConfig.icon), " ");
+	          }
 
-	            var checked = column.visible ? ' checked="checked"' : '';
-	            var disabled = visibleColumns <= _this4.options.minimumCountColumns && checked ? ' disabled="disabled"' : '';
+	          if (opts.showButtonText && buttonConfig.hasOwnProperty('text')) {
+	            buttonHtml += buttonConfig.text;
+	          }
 
-	            if (column.switchable) {
-	              html.push(Utils.sprintf(_this4.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>', column.field, i, checked, disabled, column.title)));
-	              switchableCount++;
-	            }
-	          });
+	          buttonHtml += '</button>';
+	        }
 
-	          html.push(_this4.constants.html.toolbarDropdown[1], '</div>');
-	          return html.join('');
-	        }()
-	      };
+	        buttonsHtml[buttonName] = buttonHtml;
+	        var optionName = "show".concat(buttonName.charAt(0).toUpperCase()).concat(buttonName.substring(1));
+	        var showOption = opts[optionName];
+
+	        if ((!buttonConfig.hasOwnProperty('render') || buttonConfig.hasOwnProperty('render') && buttonConfig.render) && (showOption === undefined || showOption === true)) {
+	          opts[optionName] = true;
+	        }
+
+	        if (!opts.buttonsOrder.includes(buttonName)) {
+	          opts.buttonsOrder.push(buttonName);
+	        }
+	      } // Adding the button html to the final toolbar html when the showOption is true
 
-	      if (typeof opts.buttonsOrder === 'string') {
-	        opts.buttonsOrder = opts.buttonsOrder.replace(/\[|\]| |'/g, '').toLowerCase().split(',');
-	      }
 
 	      var _iteratorNormalCompletion = true;
 	      var _didIteratorError = false;
@@ -4533,8 +4976,9 @@
 	      try {
 	        for (var _iterator = opts.buttonsOrder[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
 	          var button = _step.value;
+	          var _showOption = opts["show".concat(button.charAt(0).toUpperCase()).concat(button.substring(1))];
 
-	          if (opts['show' + button.charAt(0).toUpperCase() + button.substring(1)]) {
+	          if (_showOption) {
 	            html.push(buttonsHtml[button]);
 	          }
 	        }
@@ -4559,28 +5003,42 @@
 	        this.$toolbar.append(html.join(''));
 	      }
 
-	      if (opts.showPaginationSwitch) {
-	        this.$toolbar.find('button[name="paginationSwitch"]').off('click').on('click', function () {
-	          return _this4.togglePagination();
-	        });
-	      }
+	      for (var _i3 = 0, _Object$entries3 = Object.entries(this.buttons); _i3 < _Object$entries3.length; _i3++) {
+	        var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i3], 2),
+	            _buttonName = _Object$entries3$_i[0],
+	            _buttonConfig = _Object$entries3$_i[1];
 
-	      if (opts.showFullscreen) {
-	        this.$toolbar.find('button[name="fullscreen"]').off('click').on('click', function () {
-	          return _this4.toggleFullscreen();
-	        });
-	      }
+	        if (_buttonConfig.hasOwnProperty('event')) {
+	          if (typeof _buttonConfig.event === 'function' || typeof _buttonConfig.event === 'string') {
+	            var _ret = function () {
+	              var event = typeof _buttonConfig.event === 'string' ? window[_buttonConfig.event] : _buttonConfig.event;
 
-	      if (opts.showRefresh) {
-	        this.$toolbar.find('button[name="refresh"]').off('click').on('click', function () {
-	          return _this4.refresh();
-	        });
-	      }
+	              _this4.$toolbar.find("button[name=\"".concat(_buttonName, "\"]")).off('click').on('click', function () {
+	                return event.call(_this4);
+	              });
 
-	      if (opts.showToggle) {
-	        this.$toolbar.find('button[name="toggle"]').off('click').on('click', function () {
-	          _this4.toggleView();
-	        });
+	              return "continue";
+	            }();
+
+	            if (_ret === "continue") continue;
+	          }
+
+	          var _loop = function _loop() {
+	            var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i5], 2),
+	                eventType = _Object$entries5$_i[0],
+	                eventFunction = _Object$entries5$_i[1];
+
+	            var event = typeof eventFunction === 'string' ? window[eventFunction] : eventFunction;
+
+	            _this4.$toolbar.find("button[name=\"".concat(_buttonName, "\"]")).off(eventType).on(eventType, function () {
+	              return event.call(_this4);
+	            });
+	          };
+
+	          for (var _i5 = 0, _Object$entries5 = Object.entries(_buttonConfig.event); _i5 < _Object$entries5.length; _i5++) {
+	            _loop();
+	          }
+	        }
 	      }
 
 	      if (opts.showColumns) {
@@ -4614,7 +5072,7 @@
 	        });
 
 	        if (opts.showColumnsSearch) {
-	          var $columnsSearch = $keepOpen.find('#columnsSearch');
+	          var $columnsSearch = $keepOpen.find('[name="columnsSearch"]');
 	          var $listItems = $keepOpen.find('.dropdown-item-marker');
 	          $columnsSearch.on('keyup paste change', function (_ref4) {
 	            var currentTarget = _ref4.currentTarget;
@@ -4632,14 +5090,35 @@
 	            });
 	          });
 	        }
-	      } // Fix #4516: this.showSearchClearButton is for extensions
+	      }
+
+	      var handleInputEvent = function handleInputEvent($searchInput) {
+	        var eventTriggers = 'keyup drop blur mouseup';
+	        $searchInput.off(eventTriggers).on(eventTriggers, function (event) {
+	          if (opts.searchOnEnterKey && event.keyCode !== 13) {
+	            return;
+	          }
+
+	          if ([37, 38, 39, 40].includes(event.keyCode)) {
+	            return;
+	          }
+
+	          clearTimeout(timeoutId); // doesn't matter if it's 0
 
+	          timeoutId = setTimeout(function () {
+	            _this4.onSearch({
+	              currentTarget: event.currentTarget
+	            });
+	          }, opts.searchTimeOut);
+	        });
+	      }; // Fix #4516: this.showSearchClearButton is for extensions
 
-	      if (opts.search || this.showSearchClearButton) {
+
+	      if ((opts.search || this.showSearchClearButton) && typeof opts.searchSelector !== 'string') {
 	        html = [];
 	        var showSearchButton = Utils.sprintf(this.constants.html.searchButton, this.constants.buttonsClass, opts.formatSearch(), opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.search) : '', opts.showButtonText ? opts.formatSearch() : '');
 	        var showSearchClearButton = Utils.sprintf(this.constants.html.searchClearButton, this.constants.buttonsClass, opts.formatClearSearch(), opts.showButtonIcons ? Utils.sprintf(this.constants.html.icon, opts.iconsPrefix, opts.icons.clearSearch) : '', opts.showButtonText ? opts.formatClearSearch() : '');
-	        var searchInputHtml = "<input class=\"".concat(this.constants.classes.input, "\n        ").concat(Utils.sprintf(' %s%s', this.constants.classes.inputPrefix, opts.iconSize), "\n        search-input\" type=\"text\" placeholder=\"").concat(opts.formatSearch(), "\" autocomplete=\"off\">");
+	        var searchInputHtml = "<input class=\"".concat(this.constants.classes.input, "\n        ").concat(Utils.sprintf(' %s%s', this.constants.classes.inputPrefix, opts.iconSize), "\n        search-input\" type=\"search\" placeholder=\"").concat(opts.formatSearch(), "\" autocomplete=\"off\">");
 	        var searchInputFinalHtml = searchInputHtml;
 
 	        if (opts.showSearchButton || opts.showSearchClearButton) {
@@ -4650,31 +5129,10 @@
 
 	        html.push(Utils.sprintf("\n        <div class=\"".concat(this.constants.classes.pull, "-").concat(opts.searchAlign, " search ").concat(this.constants.classes.inputGroup, "\">\n          %s\n        </div>\n      "), searchInputFinalHtml));
 	        this.$toolbar.append(html.join(''));
-	        var $searchInput = this.$toolbar.find('.search input');
-
-	        var handleInputEvent = function handleInputEvent() {
-	          var eventTriggers = "keyup drop blur ".concat(Utils.isIEBrowser() ? 'mouseup' : '');
-	          $searchInput.off(eventTriggers).on(eventTriggers, function (event) {
-	            if (opts.searchOnEnterKey && event.keyCode !== 13) {
-	              return;
-	            }
-
-	            if ([37, 38, 39, 40].includes(event.keyCode)) {
-	              return;
-	            }
-
-	            clearTimeout(timeoutId); // doesn't matter if it's 0
-
-	            timeoutId = setTimeout(function () {
-	              _this4.onSearch({
-	                currentTarget: event.currentTarget
-	              });
-	            }, opts.searchTimeOut);
-	          });
-	        };
+	        var $searchInput = Utils.getSearchInput(this);
 
 	        if (opts.showSearchButton) {
-	          this.$toolbar.find('.search button[name=search]').off('click').on('click', function (event) {
+	          this.$toolbar.find('.search button[name=search]').off('click').on('click', function () {
 	            clearTimeout(timeoutId); // doesn't matter if it's 0
 
 	            timeoutId = setTimeout(function () {
@@ -4685,10 +5143,10 @@
 	          });
 
 	          if (opts.searchOnEnterKey) {
-	            handleInputEvent();
+	            handleInputEvent($searchInput);
 	          }
 	        } else {
-	          handleInputEvent();
+	          handleInputEvent($searchInput);
 	        }
 
 	        if (opts.showSearchClearButton) {
@@ -4696,6 +5154,10 @@
 	            _this4.resetSearch();
 	          });
 	        }
+	      } else if (typeof opts.searchSelector === 'string') {
+	        var _$searchInput = Utils.getSearchInput(this);
+
+	        handleInputEvent(_$searchInput);
 	      }
 	    }
 	  }, {
@@ -4714,11 +5176,11 @@
 	          $(currentTarget).val(text);
 	        }
 
-	        if (this.searchText === text && text.length > 0) {
+	        if (this.searchText === text) {
 	          return;
 	        }
 
-	        if ($(currentTarget).hasClass('search-input')) {
+	        if (currentTarget === Utils.getSearchInput(this)[0] || $(currentTarget).hasClass('search-input')) {
 	          this.searchText = text;
 	          this.options.searchText = text;
 	        }
@@ -4750,6 +5212,11 @@
 	      if (this.options.sidePagination !== 'server') {
 	        if (this.options.customSearch) {
 	          this.data = Utils.calculateObjectValue(this.options, this.options.customSearch, [this.options.data, this.searchText, this.filterColumns]);
+
+	          if (this.options.sortReset) {
+	            this.unsortedData = _toConsumableArray(this.data);
+	          }
+
 	          return;
 	        }
 
@@ -4757,11 +5224,11 @@
 	        var f = Utils.isEmptyObject(this.filterColumns) ? null : this.filterColumns; // Check filter
 
 	        if (typeof this.filterOptions.filterAlgorithm === 'function') {
-	          this.data = this.options.data.filter(function (item, i) {
+	          this.data = this.options.data.filter(function (item) {
 	            return _this5.filterOptions.filterAlgorithm.apply(null, [item, f]);
 	          });
 	        } else if (typeof this.filterOptions.filterAlgorithm === 'string') {
-	          this.data = f ? this.options.data.filter(function (item, i) {
+	          this.data = f ? this.options.data.filter(function (item) {
 	            var filterAlgorithm = _this5.filterOptions.filterAlgorithm;
 
 	            if (filterAlgorithm === 'and') {
@@ -4783,7 +5250,7 @@
 	            }
 
 	            return true;
-	          }) : this.options.data;
+	          }) : _toConsumableArray(this.options.data);
 	        }
 
 	        var visibleFields = this.getVisibleFields();
@@ -4801,13 +5268,17 @@
 	              value = item;
 	              var props = key.split('.');
 
-	              for (var _i2 = 0; _i2 < props.length; _i2++) {
-	                if (value[props[_i2]] !== null) {
-	                  value = value[props[_i2]];
+	              for (var _i6 = 0; _i6 < props.length; _i6++) {
+	                if (value[props[_i6]] !== null) {
+	                  value = value[props[_i6]];
 	                }
 	              }
 	            } else {
 	              value = item[key];
+	            }
+
+	            if (_this5.options.searchAccentNeutralise) {
+	              value = Utils.normalizeAccent(value);
 	            } // Fix #142: respect searchFormatter boolean
 
 
@@ -4867,9 +5338,13 @@
 
 	          return false;
 	        }) : this.data;
-	      }
 
-	      this.initSort();
+	        if (this.options.sortReset) {
+	          this.unsortedData = _toConsumableArray(this.data);
+	        }
+
+	        this.initSort();
+	      }
 	    }
 	  }, {
 	    key: "initPagination",
@@ -4909,6 +5384,11 @@
 
 	        return value;
 	      });
+	      this.paginationParts = opts.paginationParts;
+
+	      if (typeof this.paginationParts === 'string') {
+	        this.paginationParts = this.paginationParts.replace(/\[|\]| |'/g, '').split(',');
+	      }
 
 	      if (opts.sidePagination !== 'server') {
 	        opts.totalRows = data.length;
@@ -4945,14 +5425,20 @@
 	        this.options.totalNotFiltered = undefined;
 	      }
 
-	      var paginationInfo = opts.onlyInfoPagination ? opts.formatDetailPagination(opts.totalRows) : opts.formatShowingRows(this.pageFrom, this.pageTo, opts.totalRows, opts.totalNotFiltered);
-	      html.push("<div class=\"".concat(this.constants.classes.pull, "-").concat(opts.paginationDetailHAlign, " pagination-detail\">\n      <span class=\"pagination-info\">\n      ").concat(paginationInfo, "\n      </span>"));
+	      if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort') || this.paginationParts.includes('pageSize')) {
+	        html.push("<div class=\"".concat(this.constants.classes.pull, "-").concat(opts.paginationDetailHAlign, " pagination-detail\">"));
+	      }
 
-	      if (!opts.onlyInfoPagination) {
+	      if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort')) {
+	        var paginationInfo = this.paginationParts.includes('pageInfoShort') ? opts.formatDetailPagination(opts.totalRows) : opts.formatShowingRows(this.pageFrom, this.pageTo, opts.totalRows, opts.totalNotFiltered);
+	        html.push("<span class=\"pagination-info\">\n      ".concat(paginationInfo, "\n      </span>"));
+	      }
+
+	      if (this.paginationParts.includes('pageSize')) {
 	        html.push('<span class="page-list">');
 	        var pageNumber = ["<span class=\"".concat(this.constants.classes.paginationDropdown, "\">\n        <button class=\"").concat(this.constants.buttonsClass, " dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\">\n        <span class=\"page-size\">\n        ").concat(allSelected ? opts.formatAllRows() : opts.pageSize, "\n        </span>\n        ").concat(this.constants.html.dropdownCaret, "\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];
 	        pageList.forEach(function (page, i) {
-	          if (!opts.smartDisplay || i === 0 || pageList[i - 1] < opts.totalRows) {
+	          if (!opts.smartDisplay || i === 0 || pageList[i - 1] < opts.totalRows || page === opts.formatAllRows()) {
 	            var active;
 
 	            if (allSelected) {
@@ -4966,7 +5452,13 @@
 	        });
 	        pageNumber.push("".concat(this.constants.html.pageDropdown[1], "</span>"));
 	        html.push(opts.formatRecordsPerPage(pageNumber.join('')));
+	      }
+
+	      if (this.paginationParts.includes('pageInfo') || this.paginationParts.includes('pageInfoShort') || this.paginationParts.includes('pageSize')) {
 	        html.push('</span></div>');
+	      }
+
+	      if (this.paginationParts.includes('pageList')) {
 	        html.push("<div class=\"".concat(this.constants.classes.pull, "-").concat(opts.paginationHAlign, " pagination\">"), Utils.sprintf(this.constants.html.pagination[0], Utils.sprintf(' pagination-%s', opts.iconSize)), Utils.sprintf(this.constants.html.paginationItem, ' page-pre', opts.formatSRPaginationPreText(), opts.paginationPreText));
 
 	        if (this.totalPages < opts.paginationSuccessivelySize) {
@@ -5011,14 +5503,12 @@
 	          if (from - 1 === max + 1) {
 	            i = from - 1;
 	            html.push(pageItem(i));
-	          } else {
-	            if (from - 1 > max) {
-	              if (from - opts.paginationPagesBySide * 2 > opts.paginationPagesBySide && opts.paginationUseIntermediate) {
-	                i = Math.round((from - middleSize) / 2 + middleSize);
-	                html.push(pageItem(i, ' page-intermediate'));
-	              } else {
-	                html.push(Utils.sprintf(this.constants.html.paginationItem, ' page-first-separator disabled', '', '...'));
-	              }
+	          } else if (from - 1 > max) {
+	            if (from - opts.paginationPagesBySide * 2 > opts.paginationPagesBySide && opts.paginationUseIntermediate) {
+	              i = Math.round((from - middleSize) / 2 + middleSize);
+	              html.push(pageItem(i, ' page-intermediate'));
+	            } else {
+	              html.push(Utils.sprintf(this.constants.html.paginationItem, ' page-first-separator disabled', '', '...'));
 	            }
 	          }
 	        }
@@ -5034,14 +5524,12 @@
 	          if (to + 1 === min - 1) {
 	            i = to + 1;
 	            html.push(pageItem(i));
-	          } else {
-	            if (min > to + 1) {
-	              if (this.totalPages - to > opts.paginationPagesBySide * 2 && opts.paginationUseIntermediate) {
-	                i = Math.round((this.totalPages - middleSize - to) / 2 + to);
-	                html.push(pageItem(i, ' page-intermediate'));
-	              } else {
-	                html.push(Utils.sprintf(this.constants.html.paginationItem, ' page-last-separator disabled', '', '...'));
-	              }
+	          } else if (min > to + 1) {
+	            if (this.totalPages - to > opts.paginationPagesBySide * 2 && opts.paginationUseIntermediate) {
+	              i = Math.round((this.totalPages - middleSize - to) / 2 + to);
+	              html.push(pageItem(i, ' page-intermediate'));
+	            } else {
+	              html.push(Utils.sprintf(this.constants.html.paginationItem, ' page-last-separator disabled', '', '...'));
 	            }
 	          }
 
@@ -5119,14 +5607,13 @@
 	      }
 
 	      this.initPagination();
+	      this.trigger('page-change', this.options.pageNumber, this.options.pageSize);
 
 	      if (this.options.sidePagination === 'server') {
 	        this.initServer();
 	      } else {
 	        this.initBody();
 	      }
-
-	      this.trigger('page-change', this.options.pageNumber, this.options.pageSize);
 	    }
 	  }, {
 	    key: "onPageListChange",
@@ -5179,7 +5666,8 @@
 	      this.options.pageNumber = +$(event.currentTarget).text();
 	      this.updatePagination(event);
 	      return false;
-	    }
+	    } // eslint-disable-next-line no-unused-vars
+
 	  }, {
 	    key: "initRow",
 	    value: function initRow(item, i, data, trFragments) {
@@ -5199,10 +5687,10 @@
 	      style = Utils.calculateObjectValue(this.options, this.options.rowStyle, [item, i], style);
 
 	      if (style && style.css) {
-	        for (var _i3 = 0, _Object$entries2 = Object.entries(style.css); _i3 < _Object$entries2.length; _i3++) {
-	          var _Object$entries2$_i = _slicedToArray(_Object$entries2[_i3], 2),
-	              key = _Object$entries2$_i[0],
-	              value = _Object$entries2$_i[1];
+	        for (var _i7 = 0, _Object$entries6 = Object.entries(style.css); _i7 < _Object$entries6.length; _i7++) {
+	          var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
+	              key = _Object$entries6$_i[0],
+	              value = _Object$entries6$_i[1];
 
 	          csses.push("".concat(key, ": ").concat(value));
 	        }
@@ -5211,20 +5699,20 @@
 	      attributes = Utils.calculateObjectValue(this.options, this.options.rowAttributes, [item, i], attributes);
 
 	      if (attributes) {
-	        for (var _i4 = 0, _Object$entries3 = Object.entries(attributes); _i4 < _Object$entries3.length; _i4++) {
-	          var _Object$entries3$_i = _slicedToArray(_Object$entries3[_i4], 2),
-	              _key2 = _Object$entries3$_i[0],
-	              _value = _Object$entries3$_i[1];
+	        for (var _i8 = 0, _Object$entries7 = Object.entries(attributes); _i8 < _Object$entries7.length; _i8++) {
+	          var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2),
+	              _key2 = _Object$entries7$_i[0],
+	              _value = _Object$entries7$_i[1];
 
 	          htmlAttributes.push("".concat(_key2, "=\"").concat(Utils.escapeHTML(_value), "\""));
 	        }
 	      }
 
 	      if (item._data && !Utils.isEmptyObject(item._data)) {
-	        for (var _i5 = 0, _Object$entries4 = Object.entries(item._data); _i5 < _Object$entries4.length; _i5++) {
-	          var _Object$entries4$_i = _slicedToArray(_Object$entries4[_i5], 2),
-	              k = _Object$entries4$_i[0],
-	              v = _Object$entries4$_i[1];
+	        for (var _i9 = 0, _Object$entries8 = Object.entries(item._data); _i9 < _Object$entries8.length; _i9++) {
+	          var _Object$entries8$_i = _slicedToArray(_Object$entries8[_i9], 2),
+	              k = _Object$entries8$_i[0],
+	              v = _Object$entries8$_i[1];
 
 	          // ignore data-index
 	          if (k === 'index') {
@@ -5235,20 +5723,26 @@
 	        }
 	      }
 
-	      html.push('<tr', Utils.sprintf(' %s', htmlAttributes.length ? htmlAttributes.join(' ') : undefined), Utils.sprintf(' id="%s"', Array.isArray(item) ? undefined : item._id), Utils.sprintf(' class="%s"', style.classes || (Array.isArray(item) ? undefined : item._class)), " data-index=\"".concat(i, "\""), Utils.sprintf(' data-uniqueid="%s"', Utils.getItemField(item, this.options.uniqueId, false)), Utils.sprintf(' data-has-detail-view="%s"', !this.options.cardView && this.options.detailView && Utils.calculateObjectValue(null, this.options.detailFilter, [i, item]) ? 'true' : undefined), Utils.sprintf('%s', data_), '>');
+	      html.push('<tr', Utils.sprintf(' %s', htmlAttributes.length ? htmlAttributes.join(' ') : undefined), Utils.sprintf(' id="%s"', Array.isArray(item) ? undefined : item._id), Utils.sprintf(' class="%s"', style.classes || (Array.isArray(item) ? undefined : item._class)), Utils.sprintf(' style="%s"', Array.isArray(item) ? undefined : item._style), " data-index=\"".concat(i, "\""), Utils.sprintf(' data-uniqueid="%s"', Utils.getItemField(item, this.options.uniqueId, false)), Utils.sprintf(' data-has-detail-view="%s"', this.options.detailView && Utils.calculateObjectValue(null, this.options.detailFilter, [i, item]) ? 'true' : undefined), Utils.sprintf('%s', data_), '>');
 
 	      if (this.options.cardView) {
 	        html.push("<td colspan=\"".concat(this.header.fields.length, "\"><div class=\"card-views\">"));
 	      }
 
-	      if (!this.options.cardView && this.options.detailView && this.options.detailViewIcon) {
-	        html.push('<td>');
+	      var detailViewTemplate = '';
+
+	      if (Utils.hasDetailViewIcon(this.options)) {
+	        detailViewTemplate = '<td>';
 
 	        if (Utils.calculateObjectValue(null, this.options.detailFilter, [i, item])) {
-	          html.push("\n          <a class=\"detail-icon\" href=\"#\">\n          ".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.detailOpen), "\n          </a>\n        "));
+	          detailViewTemplate += "\n          <a class=\"detail-icon\" href=\"#\">\n          ".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, this.options.icons.detailOpen), "\n          </a>\n        ");
 	        }
 
-	        html.push('</td>');
+	        detailViewTemplate += '</td>';
+	      }
+
+	      if (detailViewTemplate && this.options.detailViewAlign !== 'right') {
+	        html.push(detailViewTemplate);
 	      }
 
 	      this.header.fields.forEach(function (field, j) {
@@ -5260,13 +5754,14 @@
 	        var id_ = '';
 	        var class_ = _this7.header.classes[j];
 	        var style_ = '';
+	        var styleToAdd_ = '';
 	        var data_ = '';
 	        var rowspan_ = '';
 	        var colspan_ = '';
 	        var title_ = '';
 	        var column = _this7.columns[j];
 
-	        if (_this7.fromHtml && typeof value_ === 'undefined') {
+	        if ((_this7.fromHtml || _this7.autoMergeCells) && typeof value_ === 'undefined') {
 	          if (!column.checkbox && !column.radio) {
 	            return;
 	          }
@@ -5282,11 +5777,21 @@
 
 	        if (column.escape) {
 	          value_ = Utils.escapeHTML(value_);
-	        }
+	        } // Style concat
+
 
 	        if (csses.concat([_this7.header.styles[j]]).length) {
-	          style_ = " style=\"".concat(csses.concat([_this7.header.styles[j]]).join('; '), "\"");
-	        } // handle td's id and class
+	          styleToAdd_ += "".concat(csses.concat([_this7.header.styles[j]]).join('; '));
+	        }
+
+	        if (item["_".concat(field, "_style")]) {
+	          styleToAdd_ += "".concat(item["_".concat(field, "_style")]);
+	        }
+
+	        if (styleToAdd_) {
+	          style_ = " style=\"".concat(styleToAdd_, "\"");
+	        } // Style concat
+	        // handle id and class of td
 
 
 	        if (item["_".concat(field, "_id")]) {
@@ -5318,10 +5823,10 @@
 	        if (cellStyle.css) {
 	          var csses_ = [];
 
-	          for (var _i6 = 0, _Object$entries5 = Object.entries(cellStyle.css); _i6 < _Object$entries5.length; _i6++) {
-	            var _Object$entries5$_i = _slicedToArray(_Object$entries5[_i6], 2),
-	                _key3 = _Object$entries5$_i[0],
-	                _value2 = _Object$entries5$_i[1];
+	          for (var _i10 = 0, _Object$entries9 = Object.entries(cellStyle.css); _i10 < _Object$entries9.length; _i10++) {
+	            var _Object$entries9$_i = _slicedToArray(_Object$entries9[_i10], 2),
+	                _key3 = _Object$entries9$_i[0],
+	                _value2 = _Object$entries9$_i[1];
 
 	            csses_.push("".concat(_key3, ": ").concat(_value2));
 	          }
@@ -5330,12 +5835,17 @@
 	        }
 
 	        value = Utils.calculateObjectValue(column, _this7.header.formatters[j], [value_, item, i, field], value_);
+	        value = typeof value === 'undefined' || value === null ? _this7.options.undefinedText : value;
+
+	        if (_this7.searchText !== '' && _this7.options.searchHighlight) {
+	          value = Utils.calculateObjectValue(column, column.searchHighlightFormatter, [value, _this7.searchText], value.toString().replace(new RegExp("(".concat(_this7.searchText.replace(/[.*+?^${}()|[\]\\]/g, '\\$&'), ")"), 'gim'), '<mark>$1</mark>'));
+	        }
 
 	        if (item["_".concat(field, "_data")] && !Utils.isEmptyObject(item["_".concat(field, "_data")])) {
-	          for (var _i7 = 0, _Object$entries6 = Object.entries(item["_".concat(field, "_data")]); _i7 < _Object$entries6.length; _i7++) {
-	            var _Object$entries6$_i = _slicedToArray(_Object$entries6[_i7], 2),
-	                _k = _Object$entries6$_i[0],
-	                _v = _Object$entries6$_i[1];
+	          for (var _i11 = 0, _Object$entries10 = Object.entries(item["_".concat(field, "_data")]); _i11 < _Object$entries10.length; _i11++) {
+	            var _Object$entries10$_i = _slicedToArray(_Object$entries10[_i11], 2),
+	                _k = _Object$entries10$_i[0],
+	                _v = _Object$entries10$_i[1];
 
 	            // ignore data-index
 	            if (_k === 'index') {
@@ -5350,28 +5860,28 @@
 	          type = column.checkbox ? 'checkbox' : type;
 	          type = column.radio ? 'radio' : type;
 	          var c = column['class'] || '';
-	          var isChecked = (value === true || value_ || value && value.checked) && value !== false;
+	          var isChecked = Utils.isObject(value) && value.hasOwnProperty('checked') ? value.checked : (value === true || value_) && value !== false;
 	          var isDisabled = !column.checkboxEnabled || value && value.disabled;
 	          text = [_this7.options.cardView ? "<div class=\"card-view ".concat(c, "\">") : "<td class=\"bs-checkbox ".concat(c, "\"").concat(class_).concat(style_, ">"), "<label>\n            <input\n            data-index=\"".concat(i, "\"\n            name=\"").concat(_this7.options.selectItemName, "\"\n            type=\"").concat(type, "\"\n            ").concat(Utils.sprintf('value="%s"', item[_this7.options.idField]), "\n            ").concat(Utils.sprintf('checked="%s"', isChecked ? 'checked' : undefined), "\n            ").concat(Utils.sprintf('disabled="%s"', isDisabled ? 'disabled' : undefined), " />\n            <span></span>\n            </label>"), _this7.header.formatters[j] && typeof value === 'string' ? value : '', _this7.options.cardView ? '</div>' : '</td>'].join('');
 	          item[_this7.header.stateField] = value === true || !!value_ || value && value.checked;
-	        } else {
-	          value = typeof value === 'undefined' || value === null ? _this7.options.undefinedText : value;
+	        } else if (_this7.options.cardView) {
+	          var cardTitle = _this7.options.showHeader ? "<span class=\"card-view-title ".concat(cellStyle.classes, "\"").concat(style_, ">").concat(Utils.getFieldTitle(_this7.columns, field), "</span>") : '';
+	          text = "<div class=\"card-view\">".concat(cardTitle, "<span class=\"card-view-value ").concat(cellStyle.classes, "\"").concat(style_, ">").concat(value, "</span></div>");
 
-	          if (_this7.options.cardView) {
-	            var cardTitle = _this7.options.showHeader ? "<span class=\"card-view-title\"".concat(style_, ">").concat(Utils.getFieldTitle(_this7.columns, field), "</span>") : '';
-	            text = "<div class=\"card-view\">".concat(cardTitle, "<span class=\"card-view-value\">").concat(value, "</span></div>");
-
-	            if (_this7.options.smartDisplay && value === '') {
-	              text = '<div class="card-view"></div>';
-	            }
-	          } else {
-	            text = "<td".concat(id_).concat(class_).concat(style_).concat(data_).concat(rowspan_).concat(colspan_).concat(title_, ">").concat(value, "</td>");
+	          if (_this7.options.smartDisplay && value === '') {
+	            text = '<div class="card-view"></div>';
 	          }
+	        } else {
+	          text = "<td".concat(id_).concat(class_).concat(style_).concat(data_).concat(rowspan_).concat(colspan_).concat(title_, ">").concat(value, "</td>");
 	        }
 
 	        html.push(text);
 	      });
 
+	      if (detailViewTemplate && this.options.detailViewAlign === 'right') {
+	        html.push(detailViewTemplate);
+	      }
+
 	      if (this.options.cardView) {
 	        html.push('</div></td>');
 	      }
@@ -5401,6 +5911,7 @@
 	      var rows = [];
 	      var trFragments = $(document.createDocumentFragment());
 	      var hasTr = false;
+	      this.autoMergeCells = Utils.checkAutoMergeCells(data.slice(this.pageFrom - 1, this.pageTo));
 
 	      for (var i = this.pageFrom - 1; i < this.pageTo; i++) {
 	        var item = data[i];
@@ -5418,28 +5929,26 @@
 
 
 	      if (!hasTr) {
-	        this.$body.html("<tr class=\"no-records-found\">".concat(Utils.sprintf('<td colspan="%s">%s</td>', this.$header.find('th').length, this.options.formatNoMatches()), "</tr>"));
+	        this.$body.html("<tr class=\"no-records-found\">".concat(Utils.sprintf('<td colspan="%s">%s</td>', this.getVisibleFields().length + Utils.getDetailViewIndexOffset(this.options), this.options.formatNoMatches()), "</tr>"));
+	      } else if (!this.options.virtualScroll) {
+	        this.$body.html(trFragments);
 	      } else {
-	        if (!this.options.virtualScroll) {
-	          this.$body.html(trFragments);
-	        } else {
-	          if (this.virtualScroll) {
-	            this.virtualScroll.destroy();
-	          }
+	        if (this.virtualScroll) {
+	          this.virtualScroll.destroy();
+	        }
 
-	          this.virtualScroll = new VirtualScroll({
-	            rows: rows,
-	            fixedScroll: fixedScroll,
-	            scrollEl: this.$tableBody[0],
-	            contentEl: this.$body[0],
-	            itemHeight: this.options.virtualScrollItemHeight,
-	            callback: function callback() {
-	              _this8.fitHeader();
+	        this.virtualScroll = new VirtualScroll({
+	          rows: rows,
+	          fixedScroll: fixedScroll,
+	          scrollEl: this.$tableBody[0],
+	          contentEl: this.$body[0],
+	          itemHeight: this.options.virtualScrollItemHeight,
+	          callback: function callback() {
+	            _this8.fitHeader();
 
-	              _this8.initBodyEvent();
-	            }
-	          });
-	        }
+	            _this8.initBodyEvent();
+	          }
+	        });
 	      }
 
 	      if (!fixedScroll) {
@@ -5474,7 +5983,7 @@
 
 	        var fields = _this9.getVisibleFields();
 
-	        var field = fields[_this9.options.detailView && _this9.options.detailViewIcon && !_this9.options.cardView ? index - 1 : index];
+	        var field = fields[index - Utils.getDetailViewIndexOffset(_this9.options)];
 	        var column = _this9.columns[_this9.fieldsColumnsIndex[field]];
 	        var value = Utils.getItemField(item, field, _this9.options.escape);
 
@@ -5537,11 +6046,9 @@
 	          return;
 	        }
 
-	        if (_this9.options.detailView && !_this9.options.cardView) {
-	          fieldIndex += 1;
-	        }
+	        fieldIndex += Utils.getDetailViewIndexOffset(_this9.options);
 
-	        var _loop = function _loop(key) {
+	        var _loop2 = function _loop2(key) {
 	          if (!events.hasOwnProperty(key)) {
 	            return "continue";
 	          }
@@ -5564,9 +6071,9 @@
 	        };
 
 	        for (var key in events) {
-	          var _ret = _loop(key);
+	          var _ret2 = _loop2(key);
 
-	          if (_ret === "continue") continue;
+	          if (_ret2 === "continue") continue;
 	        }
 	      });
 	    }
@@ -5613,6 +6120,38 @@
 	        }
 	      }
 
+	      if (this.options.search && this.options.sidePagination === 'server' && this.columns.filter(function (column) {
+	        return !column.searchable;
+	      }).length) {
+	        params.searchable = [];
+	        var _iteratorNormalCompletion2 = true;
+	        var _didIteratorError2 = false;
+	        var _iteratorError2 = undefined;
+
+	        try {
+	          for (var _iterator2 = this.columns[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+	            var column = _step2.value;
+
+	            if (!column.checkbox && column.searchable && (this.options.visibleSearch && column.visible || !this.options.visibleSearch)) {
+	              params.searchable.push(column.field);
+	            }
+	          }
+	        } catch (err) {
+	          _didIteratorError2 = true;
+	          _iteratorError2 = err;
+	        } finally {
+	          try {
+	            if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
+	              _iterator2.return();
+	            }
+	          } finally {
+	            if (_didIteratorError2) {
+	              throw _iteratorError2;
+	            }
+	          }
+	        }
+	      }
+
 	      if (!Utils.isEmptyObject(this.filterColumnsPartial)) {
 	        params.filter = JSON.stringify(this.filterColumnsPartial, null);
 	      }
@@ -5686,7 +6225,7 @@
 	        this.searchText = '';
 
 	        if (this.options.searchText !== '') {
-	          var $search = this.$toolbar.find('.search input');
+	          var $search = Utils.getSearchInput(this);
 	          $search.val(this.options.searchText);
 	          this.onSearch({
 	            currentTarget: $search,
@@ -5725,13 +6264,13 @@
 	  }, {
 	    key: "resetRows",
 	    value: function resetRows() {
-	      var _iteratorNormalCompletion2 = true;
-	      var _didIteratorError2 = false;
-	      var _iteratorError2 = undefined;
+	      var _iteratorNormalCompletion3 = true;
+	      var _didIteratorError3 = false;
+	      var _iteratorError3 = undefined;
 
 	      try {
-	        for (var _iterator2 = this.data[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
-	          var row = _step2.value;
+	        for (var _iterator3 = this.data[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
+	          var row = _step3.value;
 	          this.$selectAll.prop('checked', false);
 	          this.$selectItem.prop('checked', false);
 
@@ -5740,16 +6279,16 @@
 	          }
 	        }
 	      } catch (err) {
-	        _didIteratorError2 = true;
-	        _iteratorError2 = err;
+	        _didIteratorError3 = true;
+	        _iteratorError3 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion2 && _iterator2.return != null) {
-	            _iterator2.return();
+	          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
+	            _iterator3.return();
 	          }
 	        } finally {
-	          if (_didIteratorError2) {
-	            throw _iteratorError2;
+	          if (_didIteratorError3) {
+	            throw _iteratorError3;
 	          }
 	        }
 	      }
@@ -5759,7 +6298,7 @@
 	  }, {
 	    key: "trigger",
 	    value: function trigger(_name) {
-	      var _this$options;
+	      var _this$options, _this$options2;
 
 	      var name = "".concat(_name, ".bs.table");
 
@@ -5767,11 +6306,17 @@
 	        args[_key4 - 1] = arguments[_key4];
 	      }
 
-	      (_this$options = this.options)[BootstrapTable.EVENTS[name]].apply(_this$options, args);
+	      (_this$options = this.options)[BootstrapTable.EVENTS[name]].apply(_this$options, [].concat(args, [this]));
+
+	      this.$el.trigger($.Event(name, {
+	        sender: this
+	      }), args);
+
+	      (_this$options2 = this.options).onAll.apply(_this$options2, [name].concat([].concat(args, [this])));
 
-	      this.$el.trigger($.Event(name), args);
-	      this.options.onAll(name, args);
-	      this.$el.trigger($.Event('all.bs.table'), [name, args]);
+	      this.$el.trigger($.Event('all.bs.table', {
+	        sender: this
+	      }), [name, args]);
 	    }
 	  }, {
 	    key: "resetHeader",
@@ -5841,25 +6386,22 @@
 	        $tr = $tr.next();
 	      }
 
+	      var trLength = $tr.find('> *').length;
 	      $tr.find('> *').each(function (i, el) {
 	        var $this = $(el);
-	        var index = i;
 
-	        if (_this14.options.detailView && _this14.options.detailViewIcon && !_this14.options.cardView) {
-	          if (i === 0) {
+	        if (Utils.hasDetailViewIcon(_this14.options)) {
+	          if (i === 0 && _this14.options.detailViewAlign !== 'right' || i === trLength - 1 && _this14.options.detailViewAlign === 'right') {
 	            var $thDetail = $ths.filter('.detail');
 
 	            var _zoomWidth = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
 
 	            $thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth);
+	            return;
 	          }
-
-	          index = i - 1;
 	        }
 
-	        if (index === -1) {
-	          return;
-	        }
+	        var index = i - Utils.getDetailViewIndexOffset(_this14.options);
 
 	        var $th = _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', visibleFields[index]));
 
@@ -5883,25 +6425,30 @@
 
 	      var data = this.getData();
 	      var html = [];
+	      var detailTemplate = '';
 
-	      if (!this.options.cardView && this.options.detailView && this.options.detailViewIcon) {
-	        html.push('<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>');
+	      if (Utils.hasDetailViewIcon(this.options)) {
+	        detailTemplate = '<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>';
 	      }
 
-	      var _iteratorNormalCompletion3 = true;
-	      var _didIteratorError3 = false;
-	      var _iteratorError3 = undefined;
+	      if (detailTemplate && this.options.detailViewAlign !== 'right') {
+	        html.push(detailTemplate);
+	      }
+
+	      var _iteratorNormalCompletion4 = true;
+	      var _didIteratorError4 = false;
+	      var _iteratorError4 = undefined;
 
 	      try {
-	        for (var _iterator3 = this.columns[Symbol.iterator](), _step3; !(_iteratorNormalCompletion3 = (_step3 = _iterator3.next()).done); _iteratorNormalCompletion3 = true) {
-	          var column = _step3.value;
+	        for (var _iterator4 = this.columns[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
+	          var column = _step4.value;
 	          var falign = '';
 	          var valign = '';
 	          var csses = [];
 	          var style = {};
 	          var class_ = Utils.sprintf(' class="%s"', column['class']);
 
-	          if (!column.visible) {
+	          if (!column.visible || this.footerData && this.footerData.length > 0 && !(column.field in this.footerData[0])) {
 	            continue;
 	          }
 
@@ -5914,12 +6461,12 @@
 	          style = Utils.calculateObjectValue(null, this.options.footerStyle, [column]);
 
 	          if (style && style.css) {
-	            for (var _i8 = 0, _Object$entries7 = Object.entries(style.css); _i8 < _Object$entries7.length; _i8++) {
-	              var _Object$entries7$_i = _slicedToArray(_Object$entries7[_i8], 2),
-	                  key = _Object$entries7$_i[0],
-	                  value = _Object$entries7$_i[1];
+	            for (var _i12 = 0, _Object$entries11 = Object.entries(style.css); _i12 < _Object$entries11.length; _i12++) {
+	              var _Object$entries11$_i = _slicedToArray(_Object$entries11[_i12], 2),
+	                  key = _Object$entries11$_i[0],
+	                  _value3 = _Object$entries11$_i[1];
 
-	              csses.push("".concat(key, ": ").concat(value));
+	              csses.push("".concat(key, ": ").concat(_value3));
 	            }
 	          }
 
@@ -5927,29 +6474,50 @@
 	            class_ = Utils.sprintf(' class="%s"', column['class'] ? [column['class'], style.classes].join(' ') : style.classes);
 	          }
 
-	          html.push('<th', class_, Utils.sprintf(' style="%s"', falign + valign + csses.concat().join('; ')), '>');
+	          html.push('<th', class_, Utils.sprintf(' style="%s"', falign + valign + csses.concat().join('; ')));
+	          var colspan = 0;
+
+	          if (this.footerData && this.footerData.length > 0) {
+	            colspan = this.footerData[0]["_".concat(column.field, "_colspan")] || 0;
+	          }
+
+	          if (colspan) {
+	            html.push(" colspan=\"".concat(colspan, "\" "));
+	          }
+
+	          html.push('>');
 	          html.push('<div class="th-inner">');
-	          html.push(Utils.calculateObjectValue(column, column.footerFormatter, [data], this.footerData[0] && this.footerData[0][column.field] || ''));
+	          var value = '';
+
+	          if (this.footerData && this.footerData.length > 0) {
+	            value = this.footerData[0][column.field] || '';
+	          }
+
+	          html.push(Utils.calculateObjectValue(column, column.footerFormatter, [data, value], value));
 	          html.push('</div>');
 	          html.push('<div class="fht-cell"></div>');
 	          html.push('</div>');
 	          html.push('</th>');
 	        }
 	      } catch (err) {
-	        _didIteratorError3 = true;
-	        _iteratorError3 = err;
+	        _didIteratorError4 = true;
+	        _iteratorError4 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion3 && _iterator3.return != null) {
-	            _iterator3.return();
+	          if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
+	            _iterator4.return();
 	          }
 	        } finally {
-	          if (_didIteratorError3) {
-	            throw _iteratorError3;
+	          if (_didIteratorError4) {
+	            throw _iteratorError4;
 	          }
 	        }
 	      }
 
+	      if (detailTemplate && this.options.detailViewAlign === 'right') {
+	        html.push(detailTemplate);
+	      }
+
 	      if (!this.options.height && !this.$tableFooter.length) {
 	        this.$el.append('<tfoot><tr></tr></tfoot>');
 	        this.$tableFooter = this.$el.find('tfoot');
@@ -5973,32 +6541,27 @@
 	      var fixedBody = this.$tableBody.get(0);
 	      var scrollWidth = fixedBody.scrollWidth > fixedBody.clientWidth && fixedBody.scrollHeight > fixedBody.clientHeight + this.$header.outerHeight() ? Utils.getScrollBarWidth() : 0;
 	      this.$tableFooter.css('margin-right', scrollWidth).find('table').css('width', this.$el.outerWidth()).attr('class', this.$el.attr('class'));
-	      var visibleFields = this.getVisibleFields();
 	      var $ths = this.$tableFooter.find('th');
 	      var $tr = this.$body.find('>tr:first-child:not(.no-records-found)');
+	      $ths.find('.fht-cell').width('auto');
 
 	      while ($tr.length && $tr.find('>td[colspan]:not([colspan="1"])').length) {
 	        $tr = $tr.next();
 	      }
 
+	      var trLength = $tr.find('> *').length;
 	      $tr.find('> *').each(function (i, el) {
 	        var $this = $(el);
-	        var index = i;
 
-	        if (_this15.options.detailView && !_this15.options.cardView) {
-	          if (i === 0) {
+	        if (Utils.hasDetailViewIcon(_this15.options)) {
+	          if (i === 0 && _this15.options.detailViewAlign === 'left' || i === trLength - 1 && _this15.options.detailViewAlign === 'right') {
 	            var $thDetail = $ths.filter('.detail');
 
 	            var _zoomWidth2 = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
 
 	            $thDetail.find('.fht-cell').width($this.innerWidth() - _zoomWidth2);
+	            return;
 	          }
-
-	          index = i - 1;
-	        }
-
-	        if (index === -1) {
-	          return;
 	        }
 
 	        var $th = $ths.eq(i);
@@ -6032,13 +6595,13 @@
 	    key: "getVisibleFields",
 	    value: function getVisibleFields() {
 	      var visibleFields = [];
-	      var _iteratorNormalCompletion4 = true;
-	      var _didIteratorError4 = false;
-	      var _iteratorError4 = undefined;
+	      var _iteratorNormalCompletion5 = true;
+	      var _didIteratorError5 = false;
+	      var _iteratorError5 = undefined;
 
 	      try {
-	        for (var _iterator4 = this.header.fields[Symbol.iterator](), _step4; !(_iteratorNormalCompletion4 = (_step4 = _iterator4.next()).done); _iteratorNormalCompletion4 = true) {
-	          var field = _step4.value;
+	        for (var _iterator5 = this.header.fields[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
+	          var field = _step5.value;
 	          var column = this.columns[this.fieldsColumnsIndex[field]];
 
 	          if (!column || !column.visible) {
@@ -6048,16 +6611,16 @@
 	          visibleFields.push(field);
 	        }
 	      } catch (err) {
-	        _didIteratorError4 = true;
-	        _iteratorError4 = err;
+	        _didIteratorError5 = true;
+	        _iteratorError5 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion4 && _iterator4.return != null) {
-	            _iterator4.return();
+	          if (!_iteratorNormalCompletion5 && _iterator5.return != null) {
+	            _iterator5.return();
 	          }
 	        } finally {
-	          if (_didIteratorError4) {
-	            throw _iteratorError4;
+	          if (_didIteratorError5) {
+	            throw _iteratorError5;
 	          }
 	        }
 	      }
@@ -6095,9 +6658,11 @@
 	  }, {
 	    key: "getData",
 	    value: function getData(params) {
+	      var _this17 = this;
+
 	      var data = this.options.data;
 
-	      if ((this.searchText || this.options.customSearch || this.options.sortName || !Utils.isEmptyObject(this.filterColumns) || !Utils.isEmptyObject(this.filterColumnsPartial)) && (!params || !params.unfiltered)) {
+	      if ((this.searchText || this.options.customSearch || this.options.sortName !== undefined || !Utils.isEmptyObject(this.filterColumns) || !Utils.isEmptyObject(this.filterColumnsPartial)) && (!params || !params.unfiltered)) {
 	        data = this.data;
 	      }
 
@@ -6112,24 +6677,32 @@
 	        });
 	      }
 
+	      if (params && params.formatted) {
+	        data.forEach(function (row) {
+	          for (var _i13 = 0, _Object$entries12 = Object.entries(row); _i13 < _Object$entries12.length; _i13++) {
+	            var _Object$entries12$_i = _slicedToArray(_Object$entries12[_i13], 2),
+	                key = _Object$entries12$_i[0],
+	                value = _Object$entries12$_i[1];
+
+	            var column = _this17.columns[_this17.fieldsColumnsIndex[key]];
+
+	            if (!column) {
+	              return;
+	            }
+
+	            row[key] = Utils.calculateObjectValue(column, _this17.header.formatters[column.fieldIndex], [value, row, row.index, column.field], value);
+	          }
+	        });
+	      }
+
 	      return data;
 	    }
 	  }, {
 	    key: "getSelections",
 	    value: function getSelections() {
-	      var _this17 = this;
-
-	      // fix #2424: from html with checkbox
-	      return this.data.filter(function (row) {
-	        return row[_this17.header.stateField] === true;
-	      });
-	    }
-	  }, {
-	    key: "getAllSelections",
-	    value: function getAllSelections() {
 	      var _this18 = this;
 
-	      return this.options.data.filter(function (row) {
+	      return (this.options.maintainMetaData ? this.options.data : this.data).filter(function (row) {
 	        return row[_this18.header.stateField] === true;
 	      });
 	    }
@@ -6141,10 +6714,8 @@
 
 	      if (this.options.pagination && this.options.sidePagination === 'server') {
 	        this.options.totalRows = data[this.options.totalField];
-	      }
-
-	      if (this.options.pagination && this.options.sidePagination === 'server') {
 	        this.options.totalNotFiltered = data[this.options.totalNotFilteredField];
+	        this.footerData = data[this.options.footerField] ? [data[this.options.footerField]] : undefined;
 	      }
 
 	      fixedScroll = data.fixedScroll;
@@ -6175,34 +6746,30 @@
 	  }, {
 	    key: "remove",
 	    value: function remove(params) {
-	      var len = this.options.data.length;
-	      var i;
-	      var row;
+	      var removed = 0;
 
-	      if (!params.hasOwnProperty('field') || !params.hasOwnProperty('values')) {
-	        return;
-	      }
+	      for (var i = this.options.data.length - 1; i >= 0; i--) {
+	        var row = this.options.data[i];
 
-	      for (i = len - 1; i >= 0; i--) {
-	        row = this.options.data[i];
-
-	        if (!row.hasOwnProperty(params.field)) {
+	        if (!row.hasOwnProperty(params.field) && params.field !== '$index') {
 	          continue;
 	        }
 
-	        if (params.values.includes(row[params.field])) {
+	        if (!row.hasOwnProperty(params.field) && params.field === '$index' && params.values.includes(i) || params.values.includes(row[params.field])) {
+	          removed++;
 	          this.options.data.splice(i, 1);
-
-	          if (this.options.sidePagination === 'server') {
-	            this.options.totalRows -= 1;
-	          }
 	        }
 	      }
 
-	      if (len === this.options.data.length) {
+	      if (!removed) {
 	        return;
 	      }
 
+	      if (this.options.sidePagination === 'server') {
+	        this.options.totalRows -= removed;
+	        this.data = _toConsumableArray(this.options.data);
+	      }
+
 	      this.initSearch();
 	      this.initPagination();
 	      this.initSort();
@@ -6235,20 +6802,18 @@
 	    key: "updateRow",
 	    value: function updateRow(params) {
 	      var allParams = Array.isArray(params) ? params : [params];
-	      var _iteratorNormalCompletion5 = true;
-	      var _didIteratorError5 = false;
-	      var _iteratorError5 = undefined;
+	      var _iteratorNormalCompletion6 = true;
+	      var _didIteratorError6 = false;
+	      var _iteratorError6 = undefined;
 
 	      try {
-	        for (var _iterator5 = allParams[Symbol.iterator](), _step5; !(_iteratorNormalCompletion5 = (_step5 = _iterator5.next()).done); _iteratorNormalCompletion5 = true) {
-	          var _params = _step5.value;
+	        for (var _iterator6 = allParams[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
+	          var _params = _step6.value;
 
 	          if (!_params.hasOwnProperty('index') || !_params.hasOwnProperty('row')) {
 	            continue;
 	          }
 
-	          $.extend(this.options.data[_params.index], _params.row);
-
 	          if (_params.hasOwnProperty('replace') && _params.replace) {
 	            this.options.data[_params.index] = _params.row;
 	          } else {
@@ -6256,16 +6821,16 @@
 	          }
 	        }
 	      } catch (err) {
-	        _didIteratorError5 = true;
-	        _iteratorError5 = err;
+	        _didIteratorError6 = true;
+	        _iteratorError6 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion5 && _iterator5.return != null) {
-	            _iterator5.return();
+	          if (!_iteratorNormalCompletion6 && _iterator6.return != null) {
+	            _iterator6.return();
 	          }
 	        } finally {
-	          if (_didIteratorError5) {
-	            throw _iteratorError5;
+	          if (_didIteratorError6) {
+	            throw _iteratorError6;
 	          }
 	        }
 	      }
@@ -6321,13 +6886,13 @@
 	    key: "updateByUniqueId",
 	    value: function updateByUniqueId(params) {
 	      var allParams = Array.isArray(params) ? params : [params];
-	      var _iteratorNormalCompletion6 = true;
-	      var _didIteratorError6 = false;
-	      var _iteratorError6 = undefined;
+	      var _iteratorNormalCompletion7 = true;
+	      var _didIteratorError7 = false;
+	      var _iteratorError7 = undefined;
 
 	      try {
-	        for (var _iterator6 = allParams[Symbol.iterator](), _step6; !(_iteratorNormalCompletion6 = (_step6 = _iterator6.next()).done); _iteratorNormalCompletion6 = true) {
-	          var _params2 = _step6.value;
+	        for (var _iterator7 = allParams[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
+	          var _params2 = _step7.value;
 
 	          if (!_params2.hasOwnProperty('id') || !_params2.hasOwnProperty('row')) {
 	            continue;
@@ -6346,16 +6911,16 @@
 	          }
 	        }
 	      } catch (err) {
-	        _didIteratorError6 = true;
-	        _iteratorError6 = err;
+	        _didIteratorError7 = true;
+	        _iteratorError7 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion6 && _iterator6.return != null) {
-	            _iterator6.return();
+	          if (!_iteratorNormalCompletion7 && _iterator7.return != null) {
+	            _iterator7.return();
 	          }
 	        } finally {
-	          if (_didIteratorError6) {
-	            throw _iteratorError6;
+	          if (_didIteratorError7) {
+	            throw _iteratorError7;
 	          }
 	        }
 	      }
@@ -6379,6 +6944,11 @@
 	        return;
 	      }
 
+	      if (this.options.sidePagination === 'server') {
+	        this.options.totalRows -= 1;
+	        this.data = _toConsumableArray(this.options.data);
+	      }
+
 	      this.initSearch();
 	      this.initPagination();
 	      this.initBody(true);
@@ -6404,10 +6974,6 @@
 	    value: function updateCellByUniqueId(params) {
 	      var _this19 = this;
 
-	      if (!params.hasOwnProperty('id') || !params.hasOwnProperty('field') || !params.hasOwnProperty('value')) {
-	        return;
-	      }
-
 	      var allParams = Array.isArray(params) ? params : [params];
 	      allParams.forEach(function (_ref6) {
 	        var id = _ref6.id,
@@ -6463,12 +7029,8 @@
 	        this.hiddenRows.splice(index, 1);
 	      }
 
-	      if (visible) {
-	        this.updatePagination();
-	      } else {
-	        this.initBody(true);
-	        this.initPagination();
-	      }
+	      this.initBody(true);
+	      this.initPagination();
 	    }
 	  }, {
 	    key: "getHiddenRows",
@@ -6476,34 +7038,35 @@
 	      if (show) {
 	        this.initHiddenRows();
 	        this.initBody(true);
+	        this.initPagination();
 	        return;
 	      }
 
 	      var data = this.getData();
 	      var rows = [];
-	      var _iteratorNormalCompletion7 = true;
-	      var _didIteratorError7 = false;
-	      var _iteratorError7 = undefined;
+	      var _iteratorNormalCompletion8 = true;
+	      var _didIteratorError8 = false;
+	      var _iteratorError8 = undefined;
 
 	      try {
-	        for (var _iterator7 = data[Symbol.iterator](), _step7; !(_iteratorNormalCompletion7 = (_step7 = _iterator7.next()).done); _iteratorNormalCompletion7 = true) {
-	          var row = _step7.value;
+	        for (var _iterator8 = data[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
+	          var row = _step8.value;
 
 	          if (this.hiddenRows.includes(row)) {
 	            rows.push(row);
 	          }
 	        }
 	      } catch (err) {
-	        _didIteratorError7 = true;
-	        _iteratorError7 = err;
+	        _didIteratorError8 = true;
+	        _iteratorError8 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion7 && _iterator7.return != null) {
-	            _iterator7.return();
+	          if (!_iteratorNormalCompletion8 && _iterator8.return != null) {
+	            _iterator8.return();
 	          }
 	        } finally {
-	          if (_didIteratorError7) {
-	            throw _iteratorError7;
+	          if (_didIteratorError8) {
+	            throw _iteratorError8;
 	          }
 	        }
 	      }
@@ -6593,13 +7156,13 @@
 	    value: function _toggleAllColumns(visible) {
 	      var _this23 = this;
 
-	      var _iteratorNormalCompletion8 = true;
-	      var _didIteratorError8 = false;
-	      var _iteratorError8 = undefined;
+	      var _iteratorNormalCompletion9 = true;
+	      var _didIteratorError9 = false;
+	      var _iteratorError9 = undefined;
 
 	      try {
-	        for (var _iterator8 = this.columns.slice().reverse()[Symbol.iterator](), _step8; !(_iteratorNormalCompletion8 = (_step8 = _iterator8.next()).done); _iteratorNormalCompletion8 = true) {
-	          var column = _step8.value;
+	        for (var _iterator9 = this.columns.slice().reverse()[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
+	          var column = _step9.value;
 
 	          if (column.switchable) {
 	            if (!visible && this.options.showColumns && this.getVisibleColumns().length === this.options.minimumCountColumns) {
@@ -6610,16 +7173,16 @@
 	          }
 	        }
 	      } catch (err) {
-	        _didIteratorError8 = true;
-	        _iteratorError8 = err;
+	        _didIteratorError9 = true;
+	        _iteratorError9 = err;
 	      } finally {
 	        try {
-	          if (!_iteratorNormalCompletion8 && _iterator8.return != null) {
-	            _iterator8.return();
+	          if (!_iteratorNormalCompletion9 && _iterator9.return != null) {
+	            _iterator9.return();
 	          }
 	        } finally {
-	          if (_didIteratorError8) {
-	            throw _iteratorError8;
+	          if (_didIteratorError9) {
+	            throw _iteratorError9;
 	          }
 	        }
 	      }
@@ -6657,11 +7220,7 @@
 	      var i;
 	      var j;
 	      var $tr = this.$body.find('>tr');
-
-	      if (this.options.detailView && !this.options.cardView) {
-	        col += 1;
-	      }
-
+	      col += Utils.getDetailViewIndexOffset(this.options);
 	      var $td = $tr.eq(row).find('>td').eq(col);
 
 	      if (row < 0 || col < 0 || row >= this.data.length) {
@@ -6693,6 +7252,7 @@
 	      this.$selectAll.add(this.$selectAll_).prop('checked', checked);
 	      this.$selectItem.filter(':enabled').prop('checked', checked);
 	      this.updateRows();
+	      this.updateSelected();
 	      var rowsAfter = this.getSelections();
 
 	      if (checked) {
@@ -6733,26 +7293,26 @@
 	      var row = this.data[index];
 
 	      if ($el.is(':radio') || this.options.singleSelect || this.options.multipleSelectRow && !this.multipleSelectRowCtrlKey && !this.multipleSelectRowShiftKey) {
-	        var _iteratorNormalCompletion9 = true;
-	        var _didIteratorError9 = false;
-	        var _iteratorError9 = undefined;
+	        var _iteratorNormalCompletion10 = true;
+	        var _didIteratorError10 = false;
+	        var _iteratorError10 = undefined;
 
 	        try {
-	          for (var _iterator9 = this.options.data[Symbol.iterator](), _step9; !(_iteratorNormalCompletion9 = (_step9 = _iterator9.next()).done); _iteratorNormalCompletion9 = true) {
-	            var r = _step9.value;
+	          for (var _iterator10 = this.options.data[Symbol.iterator](), _step10; !(_iteratorNormalCompletion10 = (_step10 = _iterator10.next()).done); _iteratorNormalCompletion10 = true) {
+	            var r = _step10.value;
 	            r[this.header.stateField] = false;
 	          }
 	        } catch (err) {
-	          _didIteratorError9 = true;
-	          _iteratorError9 = err;
+	          _didIteratorError10 = true;
+	          _iteratorError10 = err;
 	        } finally {
 	          try {
-	            if (!_iteratorNormalCompletion9 && _iterator9.return != null) {
-	              _iterator9.return();
+	            if (!_iteratorNormalCompletion10 && _iterator10.return != null) {
+	              _iterator10.return();
 	            }
 	          } finally {
-	            if (_didIteratorError9) {
-	              throw _iteratorError9;
+	            if (_didIteratorError10) {
+	              throw _iteratorError10;
 	            }
 	          }
 	        }
@@ -6764,9 +7324,12 @@
 
 	      if (this.options.multipleSelectRow) {
 	        if (this.multipleSelectRowShiftKey && this.multipleSelectRowLastSelectedIndex >= 0) {
-	          var indexes = [this.multipleSelectRowLastSelectedIndex, index].sort();
+	          var _ref8 = this.multipleSelectRowLastSelectedIndex < index ? [this.multipleSelectRowLastSelectedIndex, index] : [index, this.multipleSelectRowLastSelectedIndex],
+	              _ref9 = _slicedToArray(_ref8, 2),
+	              fromIndex = _ref9[0],
+	              toIndex = _ref9[1];
 
-	          for (var i = indexes[0] + 1; i < indexes[1]; i++) {
+	          for (var i = fromIndex + 1; i < toIndex; i++) {
 	            this.data[i][this.header.stateField] = true;
 	            this.$selectItem.filter("[data-index=\"".concat(i, "\"]")).prop('checked', true);
 	          }
@@ -6885,6 +7448,11 @@
 	        this.$tableContainer.css('height', '');
 	        this.$tableContainer.css('width', '');
 	      } else if (this.options.height) {
+	        if (this.$tableBorder) {
+	          this.$tableBorder.css('width', '');
+	          this.$tableBorder.css('height', '');
+	        }
+
 	        var toolbarHeight = this.$toolbar.outerHeight(true);
 	        var paginationHeight = this.$pagination.outerHeight(true);
 	        var height = this.options.height - toolbarHeight - paginationHeight;
@@ -6892,7 +7460,7 @@
 	        var tableHeight = $bodyTable.outerHeight();
 	        this.$tableContainer.css('height', "".concat(height, "px"));
 
-	        if (this.$tableBorder) {
+	        if (this.$tableBorder && $bodyTable.is(':visible')) {
 	          var tableBorderHeight = height - tableHeight - 2;
 
 	          if (this.$tableBody[0].scrollWidth - this.$tableBody.innerWidth()) {
@@ -6920,12 +7488,22 @@
 	  }, {
 	    key: "showLoading",
 	    value: function showLoading() {
-	      this.$tableLoading.css('display', 'flex');
+	      this.$tableLoading.toggleClass('open', true);
+	      var fontSize = this.options.loadingFontSize;
+
+	      if (this.options.loadingFontSize === 'auto') {
+	        fontSize = this.$tableLoading.width() * 0.04;
+	        fontSize = Math.max(12, fontSize);
+	        fontSize = Math.min(32, fontSize);
+	        fontSize = "".concat(fontSize, "px");
+	      }
+
+	      this.$tableLoading.find('.loading-text').css('font-size', fontSize);
 	    }
 	  }, {
 	    key: "hideLoading",
 	    value: function hideLoading() {
-	      this.$tableLoading.css('display', 'none');
+	      this.$tableLoading.toggleClass('open', false);
 	    }
 	  }, {
 	    key: "togglePagination",
@@ -6933,7 +7511,7 @@
 	      this.options.pagination = !this.options.pagination;
 	      var icon = this.options.showButtonIcons ? this.options.pagination ? this.options.icons.paginationSwitchDown : this.options.icons.paginationSwitchUp : '';
 	      var text = this.options.showButtonText ? this.options.pagination ? this.options.formatPaginationSwitchUp() : this.options.formatPaginationSwitchDown() : '';
-	      this.$toolbar.find('button[name="paginationSwitch"]').html(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon) + ' ' + text);
+	      this.$toolbar.find('button[name="paginationSwitch"]').html("".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(text));
 	      this.updatePagination();
 	    }
 	  }, {
@@ -6949,14 +7527,14 @@
 	      this.initHeader();
 	      var icon = this.options.showButtonIcons ? this.options.cardView ? this.options.icons.toggleOn : this.options.icons.toggleOff : '';
 	      var text = this.options.showButtonText ? this.options.cardView ? this.options.formatToggleOff() : this.options.formatToggleOn() : '';
-	      this.$toolbar.find('button[name="toggle"]').html(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon) + ' ' + text);
+	      this.$toolbar.find('button[name="toggle"]').html("".concat(Utils.sprintf(this.constants.html.icon, this.options.iconsPrefix, icon), " ").concat(text));
 	      this.initBody();
 	      this.trigger('toggle', this.options.cardView);
 	    }
 	  }, {
 	    key: "resetSearch",
 	    value: function resetSearch(text) {
-	      var $search = this.$toolbar.find('.search input');
+	      var $search = Utils.getSearchInput(this);
 	      $search.val(text || '');
 	      this.onSearch({
 	        currentTarget: $search
@@ -6974,10 +7552,6 @@
 	  }, {
 	    key: "scrollTo",
 	    value: function scrollTo(params) {
-	      if (typeof params === 'undefined') {
-	        return this.$tableBody.scrollTop();
-	      }
-
 	      var options = {
 	        unit: 'px',
 	        value: 0
@@ -6987,7 +7561,7 @@
 	        options = Object.assign(options, params);
 	      } else if (typeof params === 'string' && params === 'bottom') {
 	        options.value = this.$tableBody[0].scrollHeight;
-	      } else if (typeof params === 'string') {
+	      } else if (typeof params === 'string' || typeof params === 'number') {
 	        options.value = params;
 	      }
 
@@ -7005,7 +7579,7 @@
 	  }, {
 	    key: "getScrollPosition",
 	    value: function getScrollPosition() {
-	      return this.scrollTo();
+	      return this.$tableBody.scrollTop();
 	    }
 	  }, {
 	    key: "selectPage",
@@ -7069,6 +7643,17 @@
 
 	      this.trigger('expand-row', index, row, $element);
 	    }
+	  }, {
+	    key: "expandRowByUniqueId",
+	    value: function expandRowByUniqueId(uniqueId) {
+	      var row = this.getRowByUniqueId(uniqueId);
+
+	      if (!row) {
+	        return;
+	      }
+
+	      this.expandRow(this.data.indexOf(row));
+	    }
 	  }, {
 	    key: "collapseRow",
 	    value: function collapseRow(index) {
@@ -7086,6 +7671,17 @@
 	      this.trigger('collapse-row', index, row, $tr.next());
 	      $tr.next().remove();
 	    }
+	  }, {
+	    key: "collapseRowByUniqueId",
+	    value: function collapseRowByUniqueId(uniqueId) {
+	      var row = this.getRowByUniqueId(uniqueId);
+
+	      if (!row) {
+	        return;
+	      }
+
+	      this.collapseRow(this.data.indexOf(row));
+	    }
 	  }, {
 	    key: "expandAllRows",
 	    value: function expandAllRows() {
@@ -7114,13 +7710,13 @@
 	      this.columns[this.fieldsColumnsIndex[params.field]].title = this.options.escape ? Utils.escapeHTML(params.title) : params.title;
 
 	      if (this.columns[this.fieldsColumnsIndex[params.field]].visible) {
-	        var header = this.options.height !== undefined ? this.$tableHeader : this.$header;
-	        header.find('th[data-field]').each(function (i, el) {
+	        this.$header.find('th[data-field]').each(function (i, el) {
 	          if ($(el).data('field') === params.field) {
 	            $($(el).find('.th-inner')[0]).text(params.title);
 	            return false;
 	          }
 	        });
+	        this.resetView();
 	      }
 	    }
 	  }, {
@@ -7186,7 +7782,9 @@
 	    }
 
 	    if (!data) {
-	      $(el).data('bootstrap.table', data = new $.BootstrapTable(el, options));
+	      data = new $.BootstrapTable(el, options);
+	      $(el).data('bootstrap.table', data);
+	      data.init();
 	    }
 	  });
 	  return typeof value === 'undefined' ? this : value;