bootstrap-table-rails 1.12.2 → 1.13.4

data/vendor/assets/javascripts/bootstrap-table/extensions/sticky-header/bootstrap-table-sticky-header.css

@@ -1,22 +1,22 @@
 /**
  * @author vincent loh <vincent.ml@gmail.com>
- * @version: v1.0.0
- * https://github.com/vinzloh/bootstrap-table/
- * Sticky header for bootstrap-table
+ * @update zhixin wen <wenzhixin2010@gmail.com>
  */
 
 .fix-sticky {
-    position: fixed;
-    z-index: 100;
+  position: fixed !important;
+  overflow: hidden;
+  z-index: 100;
 }
-.fix-sticky thead {
-    background: #fff;
+
+.fix-sticky table thead {
+  background: #fff;
+}
+
+.fix-sticky table thead.thead-light {
+  background: #e9ecef;
 }
 
-.fix-sticky thead th,
-.fix-sticky thead th:first-child {
-    border-left: 0;
-    border-right: 0;
-    border-bottom: 1px solid #eee;
-    border-radius: 0;
+.fix-sticky table thead.thead-light {
+  background: #212529;
 }

data/vendor/assets/javascripts/bootstrap-table/extensions/sticky-header/bootstrap-table-sticky-header.js

@@ -1,118 +1,194 @@
-/**
- * @author vincent loh <vincent.ml@gmail.com>
- * @version: v1.1.0
- * https://github.com/vinzloh/bootstrap-table/
- * Sticky header for bootstrap-table
- * @update J Manuel Corona <jmcg92@gmail.com>
- */
-
-(function ($) {
-    'use strict';
-
-    var sprintf = $.fn.bootstrapTable.utils.sprintf;
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define([], factory);
+  } else if (typeof exports !== "undefined") {
+    factory();
+  } else {
+    var mod = {
+      exports: {}
+    };
+    factory();
+    global.bootstrapTableStickyHeader = mod.exports;
+  }
+})(this, function () {
+  'use strict';
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  var _createClass = function () {
+    function defineProperties(target, props) {
+      for (var i = 0; i < props.length; i++) {
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+      }
+    }
+
+    return function (Constructor, protoProps, staticProps) {
+      if (protoProps) defineProperties(Constructor.prototype, protoProps);
+      if (staticProps) defineProperties(Constructor, staticProps);
+      return Constructor;
+    };
+  }();
+
+  function _possibleConstructorReturn(self, call) {
+    if (!self) {
+      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+
+    return call && (typeof call === "object" || typeof call === "function") ? call : self;
+  }
+
+  var _get = function get(object, property, receiver) {
+    if (object === null) object = Function.prototype;
+    var desc = Object.getOwnPropertyDescriptor(object, property);
+
+    if (desc === undefined) {
+      var parent = Object.getPrototypeOf(object);
+
+      if (parent === null) {
+        return undefined;
+      } else {
+        return get(parent, property, receiver);
+      }
+    } else if ("value" in desc) {
+      return desc.value;
+    } else {
+      var getter = desc.get;
+
+      if (getter === undefined) {
+        return undefined;
+      }
+
+      return getter.call(receiver);
+    }
+  };
+
+  function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+      throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+    }
+
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+    if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+  }
+
+  /**
+   * @author vincent loh <vincent.ml@gmail.com>
+   * @update J Manuel Corona <jmcg92@gmail.com>
+   * @update zhixin wen <wenzhixin2010@gmail.com>
+   */
+
+  (function ($) {
+    var Utils = $.fn.bootstrapTable.utils;
+
     $.extend($.fn.bootstrapTable.defaults, {
-        stickyHeader: false
+      stickyHeader: false,
+      stickyHeaderOffsetY: 0
     });
-    
-    var bootstrapVersion = 3;
-    try {
-        bootstrapVersion = parseInt($.fn.dropdown.Constructor.VERSION, 10);
-    } catch (e) { }
-    var hidden_class = bootstrapVersion > 3 ? 'd-none' : 'hidden';
 
-    var BootstrapTable = $.fn.bootstrapTable.Constructor,
-        _initHeader = BootstrapTable.prototype.initHeader;
+    var hiddenClass = Utils.bootstrapVersion === 4 ? 'd-none' : 'hidden';
+
+    $.BootstrapTable = function (_$$BootstrapTable) {
+      _inherits(_class, _$$BootstrapTable);
+
+      function _class() {
+        _classCallCheck(this, _class);
+
+        return _possibleConstructorReturn(this, (_class.__proto__ || Object.getPrototypeOf(_class)).apply(this, arguments));
+      }
 
-    BootstrapTable.prototype.initHeader = function () {
-        var that = this;
-        _initHeader.apply(this, Array.prototype.slice.apply(arguments));
+      _createClass(_class, [{
+        key: 'initHeader',
+        value: function initHeader() {
+          var _get2,
+              _this2 = this;
 
-        if (!this.options.stickyHeader) {
+          for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+            args[_key] = arguments[_key];
+          }
+
+          (_get2 = _get(_class.prototype.__proto__ || Object.getPrototypeOf(_class.prototype), 'initHeader', this)).call.apply(_get2, [this].concat(args));
+
+          if (!this.options.stickyHeader) {
             return;
-        }
+          }
+
+          this.$el.before('<div class="sticky-header-container"></div>');
+          this.$el.before('<div class="sticky_anchor_begin"></div>');
+          this.$el.after('<div class="sticky_anchor_end"></div>');
+          this.$header.addClass('sticky-header');
 
-        var table = this.$tableBody.find('table'),
-            table_id = table.attr('id'),
-            header_id = table.attr('id') + '-sticky-header',
-            sticky_header_container_id = header_id +'-sticky-header-container',
-            anchor_begin_id = header_id +'_sticky_anchor_begin',
-            anchor_end_id = header_id +'_sticky_anchor_end';
-        // add begin and end anchors to track table position
-
-        table.before(sprintf('<div id="%s" class="%s"></div>', sticky_header_container_id, hidden_class));
-        table.before(sprintf('<div id="%s"></div>', anchor_begin_id));
-        table.after(sprintf('<div id="%s"></div>', anchor_end_id));
-
-        table.find('thead').attr('id', header_id);
-
-        // clone header just once, to be used as sticky header
-        // deep clone header. using source header affects tbody>td width
-        this.$stickyHeader = $($('#'+header_id).clone(true, true));
-        // avoid id conflict
-        this.$stickyHeader.removeAttr('id');
-
-        // render sticky on window scroll or resize
-        $(window).on('resize.'+table_id, table, render_sticky_header);
-        $(window).on('scroll.'+table_id, table, render_sticky_header);
-        // render sticky when table scroll left-right
-        table.closest('.fixed-table-container').find('.fixed-table-body').on('scroll.'+table_id, table, match_position_x);
-
-        this.$el.on('all.bs.table', function (e) {
-            that.$stickyHeader = $($('#'+header_id).clone(true, true));
-            that.$stickyHeader.removeAttr('id');
-        });
-
-        function render_sticky_header(event) {
-            var table = event.data;
-            var table_header_id = table.find('thead').attr('id');
-            // console.log('render_sticky_header for > '+table_header_id);
-            if (table.length < 1 || $('#'+table_id).length < 1){
-                // turn off window listeners
-                $(window).off('resize.'+table_id);
-                $(window).off('scroll.'+table_id);
-                table.closest('.fixed-table-container').find('.fixed-table-body').off('scroll.'+table_id);
-                return;
-            }
-            // get header height
-            var header_height = '0';
-            if (that.options.stickyHeaderOffsetY) header_height = that.options.stickyHeaderOffsetY.replace('px','');
-            // window scroll top
-            var t = $(window).scrollTop();
-            // top anchor scroll position, minus header height
-            var e = $("#"+anchor_begin_id).offset().top - header_height;
-            // bottom anchor scroll position, minus header height, minus sticky height
-            var e_end = $("#"+anchor_end_id).offset().top - header_height - $('#'+table_header_id).css('height').replace('px','');
-            // show sticky when top anchor touches header, and when bottom anchor not exceeded
-            if (t > e && t <= e_end) {
-                // ensure clone and source column widths are the same
-                $.each( that.$stickyHeader.find('tr').eq(0).find('th'), function (index, item) {
-                    $(item).css('min-width', $('#'+table_header_id+' tr').eq(0).find('th').eq(index).css('width'));
-                });
-                // match bootstrap table style
-                $("#"+sticky_header_container_id).removeClass(hidden_class).addClass("fix-sticky fixed-table-container") ;
-                // stick it in position
-                $("#"+sticky_header_container_id).css('top', header_height + 'px');
-                // create scrollable container for header
-                var scrollable_div = $('<div style="position:absolute;width:100%;overflow-x:hidden;" />');
-                // append cloned header to dom
-                $("#"+sticky_header_container_id).html(scrollable_div.append(that.$stickyHeader));
-                // match clone and source header positions when left-right scroll
-                match_position_x(event);
-            } else {
-                // hide sticky
-                $("#"+sticky_header_container_id).removeClass("fix-sticky").addClass(hidden_class);
-            }
+          // clone header just once, to be used as sticky header
+          // deep clone header, using source header affects tbody>td width
+          this.$stickyContainer = this.$tableBody.find('.sticky-header-container');
+          this.$stickyBegin = this.$tableBody.find('.sticky_anchor_begin');
+          this.$stickyEnd = this.$tableBody.find('.sticky_anchor_end');
+          this.$stickyHeader = this.$header.clone(true, true);
 
+          // render sticky on window scroll or resize
+          $(window).on('resize.sticky-header-table', function () {
+            return _this2.renderStickyHeader();
+          });
+          $(window).on('scroll.sticky-header-table', function () {
+            return _this2.renderStickyHeader();
+          });
+          this.$tableBody.off('scroll').on('scroll', function () {
+            return _this2.matchPositionX();
+          });
         }
-        function match_position_x(event){
-            var table = event.data;
-            var table_header_id = table.find('thead').attr('id');
+      }, {
+        key: 'renderStickyHeader',
+        value: function renderStickyHeader() {
+          var _this3 = this;
+
+          var top = $(window).scrollTop();
+          // top anchor scroll position, minus header height
+          var start = this.$stickyBegin.offset().top - this.options.stickyHeaderOffsetY;
+          // bottom anchor scroll position, minus header height, minus sticky height
+          var end = this.$stickyEnd.offset().top - this.options.stickyHeaderOffsetY - this.$header.height();
+          // show sticky when top anchor touches header, and when bottom anchor not exceeded
+          if (top > start && top <= end) {
+            // ensure clone and source column widths are the same
+            this.$stickyHeader.find('tr:eq(0)').find('th').each(function (index, el) {
+              $(el).css('min-width', _this3.$header.find('tr:eq(0)').find('th').eq(index).css('width'));
+            });
+            // match bootstrap table style
+            this.$stickyContainer.removeClass(hiddenClass).addClass('fix-sticky fixed-table-container');
+            // stick it in position
+            this.$stickyContainer.css('top', this.options.stickyHeaderOffsetY + 'px');
+            // create scrollable container for header
+            this.$stickyTable = $('<table/>');
+            this.$stickyTable.addClass(this.options.classes);
+            // append cloned header to dom
+            this.$stickyContainer.html(this.$stickyTable.append(this.$stickyHeader));
             // match clone and source header positions when left-right scroll
-            $("#"+sticky_header_container_id).css(
-                'width', +table.closest('.fixed-table-body').css('width').replace('px', '') + 1
-            );
-            $("#"+sticky_header_container_id+" thead").parent().scrollLeft(Math.abs($('#'+table_header_id).position().left));
+            this.matchPositionX();
+          } else {
+            this.$stickyContainer.removeClass('fix-sticky').addClass(hiddenClass);
+          }
         }
-    };
+      }, {
+        key: 'matchPositionX',
+        value: function matchPositionX() {
+          this.$stickyContainer.scrollLeft(this.$tableBody.scrollLeft());
+        }
+      }]);
 
-})(jQuery);
+      return _class;
+    }($.BootstrapTable);
+  })(jQuery);
+});

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

@@ -1,211 +1,373 @@
-/**
- * @author: aperez <aperez@datadec.es>
- * @version: v2.0.0
- *
- * @update Dennis Hernández <http://djhvscf.github.io/Blog>
- */
-
-!function($) {
-    'use strict';
-
-    var firstLoad = false;
-
-    var sprintf = $.fn.bootstrapTable.utils.sprintf;
-
-    var showAvdSearch = function(pColumns, searchTitle, searchText, that) {
-        if (!$("#avdSearchModal" + "_" + that.options.idTable).hasClass("modal")) {
-            var vModal = sprintf("<div id=\"avdSearchModal%s\"  class=\"modal fade\" tabindex=\"-1\" role=\"dialog\" aria-labelledby=\"mySmallModalLabel\" aria-hidden=\"true\">", "_" + that.options.idTable);
-            vModal += "<div class=\"modal-dialog modal-xs\">";
-            vModal += " <div class=\"modal-content\">";
-            vModal += "  <div class=\"modal-header\">";
-            vModal += "   <button type=\"button\" class=\"close\" data-dismiss=\"modal\" aria-hidden=\"true\" >&times;</button>";
-            vModal += sprintf("   <h4 class=\"modal-title\">%s</h4>", searchTitle);
-            vModal += "  </div>";
-            vModal += "  <div class=\"modal-body modal-body-custom\">";
-            vModal += sprintf("   <div class=\"container-fluid\" id=\"avdSearchModalContent%s\" style=\"padding-right: 0px;padding-left: 0px;\" >", "_" + that.options.idTable);
-            vModal += "   </div>";
-            vModal += "  </div>";
-            vModal += "  </div>";
-            vModal += " </div>";
-            vModal += "</div>";
-
-            $("body").append($(vModal));
-
-            var vFormAvd = createFormAvd(pColumns, searchText, that),
-                timeoutId = 0;;
-
-            $('#avdSearchModalContent' + "_" + that.options.idTable).append(vFormAvd.join(''));
-
-            $('#' + that.options.idForm).off('keyup blur', 'input').on('keyup blur', 'input', function (event) {
-                clearTimeout(timeoutId);
-                timeoutId = setTimeout(function () {
-                    that.onColumnAdvancedSearch(event);
-                }, that.options.searchTimeOut);
-            });
-
-            $("#btnCloseAvd" + "_" + that.options.idTable).click(function() {
-                $("#avdSearchModal" + "_" + that.options.idTable).modal('hide');
-            });
-
-            $("#avdSearchModal" + "_" + that.options.idTable).modal();
-        } else {
-            $("#avdSearchModal" + "_" + that.options.idTable).modal();
-        }
+(function (global, factory) {
+  if (typeof define === "function" && define.amd) {
+    define([], factory);
+  } else if (typeof exports !== "undefined") {
+    factory();
+  } else {
+    var mod = {
+      exports: {}
     };
-
-    var createFormAvd = function(pColumns, searchText, that) {
-        var htmlForm = [];
-        htmlForm.push(sprintf('<form class="form-horizontal" id="%s" action="%s" >', that.options.idForm, that.options.actionForm));
-        for (var i in pColumns) {
-            var vObjCol = pColumns[i];
-            if (!vObjCol.checkbox && vObjCol.visible && vObjCol.searchable) {
-                htmlForm.push('<div class="form-group">');
-                htmlForm.push(sprintf('<label class="col-sm-4 control-label">%s</label>', vObjCol.title));
-                htmlForm.push('<div class="col-sm-6">');
-                htmlForm.push(sprintf('<input type="text" class="form-control input-md" name="%s" placeholder="%s" id="%s">', vObjCol.field, vObjCol.title, vObjCol.field));
-                htmlForm.push('</div>');
-                htmlForm.push('</div>');
-            }
+    factory();
+    global.bootstrapTableToolbar = mod.exports;
+  }
+})(this, function () {
+  'use strict';
+
+  var _slicedToArray = function () {
+    function sliceIterator(arr, i) {
+      var _arr = [];
+      var _n = true;
+      var _d = false;
+      var _e = undefined;
+
+      try {
+        for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+          _arr.push(_s.value);
+
+          if (i && _arr.length === i) break;
         }
-
-        htmlForm.push('<div class="form-group">');
-        htmlForm.push('<div class="col-sm-offset-9 col-sm-3">');
-        htmlForm.push(sprintf('<button type="button" id="btnCloseAvd%s" class="btn btn-default" >%s</button>', "_" + that.options.idTable, searchText));
-        htmlForm.push('</div>');
-        htmlForm.push('</div>');
-        htmlForm.push('</form>');
-
-        return htmlForm;
+      } catch (err) {
+        _d = true;
+        _e = err;
+      } finally {
+        try {
+          if (!_n && _i["return"]) _i["return"]();
+        } finally {
+          if (_d) throw _e;
+        }
+      }
+
+      return _arr;
+    }
+
+    return function (arr, i) {
+      if (Array.isArray(arr)) {
+        return arr;
+      } else if (Symbol.iterator in Object(arr)) {
+        return sliceIterator(arr, i);
+      } else {
+        throw new TypeError("Invalid attempt to destructure non-iterable instance");
+      }
+    };
+  }();
+
+  function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+      throw new TypeError("Cannot call a class as a function");
+    }
+  }
+
+  var _createClass = function () {
+    function defineProperties(target, props) {
+      for (var i = 0; i < props.length; i++) {
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+      }
+    }
+
+    return function (Constructor, protoProps, staticProps) {
+      if (protoProps) defineProperties(Constructor.prototype, protoProps);
+      if (staticProps) defineProperties(Constructor, staticProps);
+      return Constructor;
     };
+  }();
+
+  function _possibleConstructorReturn(self, call) {
+    if (!self) {
+      throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
+    }
+
+    return call && (typeof call === "object" || typeof call === "function") ? call : self;
+  }
+
+  var _get = function get(object, property, receiver) {
+    if (object === null) object = Function.prototype;
+    var desc = Object.getOwnPropertyDescriptor(object, property);
+
+    if (desc === undefined) {
+      var parent = Object.getPrototypeOf(object);
+
+      if (parent === null) {
+        return undefined;
+      } else {
+        return get(parent, property, receiver);
+      }
+    } else if ("value" in desc) {
+      return desc.value;
+    } else {
+      var getter = desc.get;
+
+      if (getter === undefined) {
+        return undefined;
+      }
+
+      return getter.call(receiver);
+    }
+  };
+
+  function _inherits(subClass, superClass) {
+    if (typeof superClass !== "function" && superClass !== null) {
+      throw new TypeError("Super expression must either be null or a function, not " + typeof superClass);
+    }
+
+    subClass.prototype = Object.create(superClass && superClass.prototype, {
+      constructor: {
+        value: subClass,
+        enumerable: false,
+        writable: true,
+        configurable: true
+      }
+    });
+    if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass;
+  }
+
+  /**
+   * @author: aperez <aperez@datadec.es>
+   * @version: v2.0.0
+   *
+   * @update Dennis Hernández <http://djhvscf.github.io/Blog>
+   * @update zhixin wen <wenzhixin2010@gmail.com>
+   */
+
+  (function ($) {
+    var Utils = $.fn.bootstrapTable.utils;
+
+    var bootstrap = {
+      3: {
+        icons: {
+          advancedSearchIcon: 'glyphicon-chevron-down'
+        },
+        html: {
+          modalHeader: '\n          <div class="modal-header">\n            <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n              <span aria-hidden="true">&times;</span>\n            </button>\n            <h4 class="modal-title">%s</h4>\n          </div>\n        '
+        }
+      },
+      4: {
+        icons: {
+          advancedSearchIcon: 'fa-chevron-down'
+        },
+        html: {
+          modalHeader: '\n          <div class="modal-header">\n            <h4 class="modal-title">%s</h4>\n            <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n              <span aria-hidden="true">&times;</span>\n            </button>\n          </div>\n        '
+        }
+      }
+    }[Utils.bootstrapVersion];
 
     $.extend($.fn.bootstrapTable.defaults, {
-        advancedSearch: false,
-        idForm: 'advancedSearch',
-        actionForm: '',
-        idTable: undefined,
-        onColumnAdvancedSearch: function (field, text) {
-            return false;
-        }
+      advancedSearch: false,
+      idForm: 'advancedSearch',
+      actionForm: '',
+      idTable: undefined,
+      onColumnAdvancedSearch: function onColumnAdvancedSearch(field, text) {
+        return false;
+      }
     });
 
     $.extend($.fn.bootstrapTable.defaults.icons, {
-        advancedSearchIcon: 'glyphicon-chevron-down'
+      advancedSearchIcon: bootstrap.icons.advancedSearchIcon
     });
 
     $.extend($.fn.bootstrapTable.Constructor.EVENTS, {
-        'column-advanced-search.bs.table': 'onColumnAdvancedSearch'
+      'column-advanced-search.bs.table': 'onColumnAdvancedSearch'
     });
 
     $.extend($.fn.bootstrapTable.locales, {
-        formatAdvancedSearch: function() {
-            return 'Advanced search';
-        },
-        formatAdvancedCloseButton: function() {
-            return "Close";
-        }
+      formatAdvancedSearch: function formatAdvancedSearch() {
+        return 'Advanced search';
+      },
+      formatAdvancedCloseButton: function formatAdvancedCloseButton() {
+        return 'Close';
+      }
     });
 
     $.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);
 
-    var BootstrapTable = $.fn.bootstrapTable.Constructor,
-        _initToolbar = BootstrapTable.prototype.initToolbar,
-        _load = BootstrapTable.prototype.load,
-        _initSearch = BootstrapTable.prototype.initSearch;
+    $.BootstrapTable = function (_$$BootstrapTable) {
+      _inherits(_class, _$$BootstrapTable);
 
-    BootstrapTable.prototype.initToolbar = function() {
-        _initToolbar.apply(this, Array.prototype.slice.apply(arguments));
+      function _class() {
+        _classCallCheck(this, _class);
 
-        if (!this.options.search) {
-            return;
-        }
+        return _possibleConstructorReturn(this, (_class.__proto__ || Object.getPrototypeOf(_class)).apply(this, arguments));
+      }
 
-        if (!this.options.advancedSearch) {
-            return;
-        }
+      _createClass(_class, [{
+        key: 'initToolbar',
+        value: function initToolbar() {
+          var _this2 = this;
+
+          var o = this.options;
+
+          this.showToolbar = this.showToolbar || o.search && o.advancedSearch && o.idTable;
+
+          _get(_class.prototype.__proto__ || Object.getPrototypeOf(_class.prototype), 'initToolbar', this).call(this);
 
-        if (!this.options.idTable) {
+          if (!o.search || !o.advancedSearch || !o.idTable) {
             return;
+          }
+
+          this.$toolbar.find('>.btn-group').append('\n        <button class="btn btn-default' + Utils.sprintf(' btn-%s', o.buttonsClass) + Utils.sprintf(' btn-%s', o.iconSize) + '"\n          type="button"\n          name="advancedSearch"\n          aria-label="advanced search"\n          title="' + o.formatAdvancedSearch() + '">\n        <i class="' + o.iconsPrefix + ' ' + o.icons.advancedSearchIcon + '"></i>\n        </button>\n      ');
+
+          this.$toolbar.find('button[name="advancedSearch"]').off('click').on('click', function () {
+            return _this2.showAvdSearch();
+          });
         }
+      }, {
+        key: 'showAvdSearch',
+        value: function showAvdSearch() {
+          var _this3 = this;
 
-        var that = this,
-            html = [];
+          var o = this.options;
 
-        html.push(sprintf('<div class="columns columns-%s btn-group pull-%s" role="group">', this.options.buttonsAlign, this.options.buttonsAlign));
-        html.push(sprintf('<button class="btn btn-default%s' + '" type="button" name="advancedSearch" aria-label="advanced search" title="%s">', that.options.iconSize === undefined ? '' : ' btn-' + that.options.iconSize, that.options.formatAdvancedSearch()));
-        html.push(sprintf('<i class="%s %s"></i>', that.options.iconsPrefix, that.options.icons.advancedSearchIcon))
-        html.push('</button></div>');
+          if (!$('#avdSearchModal_' + o.idTable).hasClass('modal')) {
+            $('body').append('\n          <div id="avdSearchModal_' + o.idTable + '"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n            <div class="modal-dialog modal-xs">\n              <div class="modal-content">\n                ' + Utils.sprintf(bootstrap.html.modalHeader, o.formatAdvancedSearch()) + '\n                <div class="modal-body modal-body-custom">\n                  <div class="container-fluid" id="avdSearchModalContent_' + o.idTable + '"\n                    style="padding-right: 0px; padding-left: 0px;" >\n                  </div>\n                </div>\n                <div class="modal-footer">\n                  <button type="button" id="btnCloseAvd_' + o.idTable + '" class="btn btn-' + o.buttonsClass + '">\n                    ' + o.formatAdvancedCloseButton() + '\n                  </button>\n                </div>\n              </div>\n            </div>\n          </div>\n        ');
 
-        that.$toolbar.prepend(html.join(''));
+            var timeoutId = 0;
 
-        that.$toolbar.find('button[name="advancedSearch"]')
-            .off('click').on('click', function() {
-                showAvdSearch(that.columns, that.options.formatAdvancedSearch(), that.options.formatAdvancedCloseButton(), that);
+            $('#avdSearchModalContent_' + o.idTable).append(this.createFormAvd().join(''));
+
+            $('#' + o.idForm).off('keyup blur', 'input').on('keyup blur', 'input', function (e) {
+              if (o.sidePagination === 'server') {
+                _this3.onColumnAdvancedSearch(e);
+              } else {
+                clearTimeout(timeoutId);
+                timeoutId = setTimeout(function () {
+                  _this3.onColumnAdvancedSearch(e);
+                }, o.searchTimeOut);
+              }
             });
-    };
 
-    BootstrapTable.prototype.load = function(data) {
-        _load.apply(this, Array.prototype.slice.apply(arguments));
+            $('#btnCloseAvd_' + o.idTable).click(function () {
+              $('#avdSearchModal_' + o.idTable).modal('hide');
+              if (o.sidePagination === 'server') {
+                _this3.options.pageNumber = 1;
+                _this3.updatePagination();
+                _this3.trigger('column-advanced-search', _this3.filterColumnsPartial);
+              }
+            });
 
-        if (!this.options.advancedSearch) {
-            return;
+            $('#avdSearchModal_' + o.idTable).modal();
+          } else {
+            $('#avdSearchModal_' + o.idTable).modal();
+          }
         }
-
-        if (typeof this.options.idTable === 'undefined') {
-            return;
-        } else {
-            if (!firstLoad) {
-                var height = parseInt($(".bootstrap-table").height());
-                height += 10;
-                $("#" + this.options.idTable).bootstrapTable("resetView", {height: height});
-                firstLoad = true;
+      }, {
+        key: 'createFormAvd',
+        value: function createFormAvd() {
+          var o = this.options;
+          var html = ['<form class="form-horizontal" id="' + o.idForm + '" action="' + o.actionForm + '">'];
+
+          var _iteratorNormalCompletion = true;
+          var _didIteratorError = false;
+          var _iteratorError = undefined;
+
+          try {
+            for (var _iterator = this.columns[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
+              var column = _step.value;
+
+              if (!column.checkbox && column.visible && column.searchable) {
+                html.push('\n            <div class="form-group row">\n              <label class="col-sm-4 control-label">' + column.title + '</label>\n              <div class="col-sm-6">\n                <input type="text" class="form-control input-md" name="' + column.field + '" placeholder="' + column.title + '" id="' + column.field + '">\n              </div>\n            </div>\n          ');
+              }
+            }
+          } catch (err) {
+            _didIteratorError = true;
+            _iteratorError = err;
+          } finally {
+            try {
+              if (!_iteratorNormalCompletion && _iterator.return) {
+                _iterator.return();
+              }
+            } finally {
+              if (_didIteratorError) {
+                throw _iteratorError;
+              }
             }
+          }
+
+          html.push('</form>');
+
+          return html;
         }
-    };
+      }, {
+        key: 'initSearch',
+        value: function initSearch() {
+          var _this4 = this;
 
-    BootstrapTable.prototype.initSearch = function () {
-        _initSearch.apply(this, Array.prototype.slice.apply(arguments));
+          _get(_class.prototype.__proto__ || Object.getPrototypeOf(_class.prototype), 'initSearch', this).call(this);
 
-        if (!this.options.advancedSearch) {
+          if (!this.options.advancedSearch || this.options.sidePagination === 'server') {
             return;
-        }
+          }
+
+          var fp = $.isEmptyObject(this.filterColumnsPartial) ? null : this.filterColumnsPartial;
+
+          this.data = fp ? $.grep(this.data, function (item, i) {
+            var _iteratorNormalCompletion2 = true;
+            var _didIteratorError2 = false;
+            var _iteratorError2 = undefined;
+
+            try {
+              for (var _iterator2 = Object.entries(fp)[Symbol.iterator](), _step2; !(_iteratorNormalCompletion2 = (_step2 = _iterator2.next()).done); _iteratorNormalCompletion2 = true) {
+                var _ref = _step2.value;
 
-        var that = this;
-        var fp = $.isEmptyObject(this.filterColumnsPartial) ? null : this.filterColumnsPartial;
+                var _ref2 = _slicedToArray(_ref, 2);
 
-        this.data = fp ? $.grep(this.data, function (item, i) {
-            for (var key in fp) {
-                var fval = fp[key].toLowerCase();
+                var key = _ref2[0];
+                var v = _ref2[1];
+
+                var fval = v.toLowerCase();
                 var value = item[key];
-                value = $.fn.bootstrapTable.utils.calculateObjectValue(that.header,
-                    that.header.formatters[$.inArray(key, that.header.fields)],
-                    [value, item, i], value);
-
-                if (!($.inArray(key, that.header.fields) !== -1 &&
-                    (typeof value === 'string' || typeof value === 'number') &&
-                    (value + '').toLowerCase().indexOf(fval) !== -1)) {
-                    return false;
+                var index = _this4.header.fields.indexOf(key);
+                value = Utils.calculateObjectValue(_this4.header, _this4.header.formatters[index], [value, item, i], value);
+
+                if (!(index !== -1 && (typeof value === 'string' || typeof value === 'number') && ('' + value).toLowerCase().includes(fval))) {
+                  return false;
+                }
+              }
+            } catch (err) {
+              _didIteratorError2 = true;
+              _iteratorError2 = err;
+            } finally {
+              try {
+                if (!_iteratorNormalCompletion2 && _iterator2.return) {
+                  _iterator2.return();
                 }
+              } finally {
+                if (_didIteratorError2) {
+                  throw _iteratorError2;
+                }
+              }
             }
-            return true;
-        }) : this.data;
-    };
 
-    BootstrapTable.prototype.onColumnAdvancedSearch = function (event) {
-        var text = $.trim($(event.currentTarget).val());
-        var $field = $(event.currentTarget)[0].id;
+            return true;
+          }) : this.data;
+        }
+      }, {
+        key: 'onColumnAdvancedSearch',
+        value: function onColumnAdvancedSearch(e) {
+          var text = $.trim($(e.currentTarget).val());
+          var $field = $(e.currentTarget)[0].id;
 
-        if ($.isEmptyObject(this.filterColumnsPartial)) {
+          if ($.isEmptyObject(this.filterColumnsPartial)) {
             this.filterColumnsPartial = {};
-        }
-        if (text) {
+          }
+          if (text) {
             this.filterColumnsPartial[$field] = text;
-        } else {
+          } else {
             delete this.filterColumnsPartial[$field];
+          }
+
+          if (this.options.sidePagination !== 'server') {
+            this.options.pageNumber = 1;
+            this.onSearch(e);
+            this.updatePagination();
+            this.trigger('column-advanced-search', $field, text);
+          }
         }
+      }]);
 
-        this.options.pageNumber = 1;
-        this.onSearch(event);
-        this.updatePagination();
-        this.trigger('column-advanced-search', $field, text);
-    };
-}(jQuery);
+      return _class;
+    }($.BootstrapTable);
+  })(jQuery);
+});