vendor/assets/javascripts/bootstrap-table/bootstrap-table.js in bootstrap-table-rails-1.15.4 vs vendor/assets/javascripts/bootstrap-table/bootstrap-table.js in bootstrap-table-rails-1.15.5
- old
+ new
@@ -2632,11 +2632,11 @@
function _nonIterableRest() {
throw new TypeError("Invalid attempt to destructure non-iterable instance");
}
- var VERSION = '1.15.4';
+ var VERSION = '1.15.5';
var bootstrapVersion = 4;
try {
var rawVersion = $.fn.dropdown.Constructor.VERSION; // Only try to parse VERSION if it is defined.
// It is undefined in older versions of Bootstrap (tested with 3.1.1).
@@ -2668,21 +2668,22 @@
buttons: 'default',
buttonsGroup: 'btn-group',
buttonsDropdown: 'btn-group',
pull: 'pull',
inputGroup: 'input-group',
+ inputPrefix: 'input-',
input: 'form-control',
paginationDropdown: 'btn-group dropdown',
dropup: 'dropup',
dropdownActive: 'active',
paginationActive: 'active',
buttonActive: 'active'
},
html: {
toolbarDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
toolbarDropdownItem: '<li role="menuitem"><label>%s</label></li>',
- toolbarDropdownSeperator: '<li class="divider"></li>',
+ toolbarDropdownSeparator: '<li class="divider"></li>',
pageDropdown: ['<ul class="dropdown-menu" role="menu">', '</ul>'],
pageDropdownItem: '<li role="menuitem" class="%s"><a href="#">%s</a></li>',
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>',
@@ -2713,10 +2714,11 @@
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',
@@ -2725,11 +2727,11 @@
html: {
toolbarDropdown: ['<div class="dropdown-menu dropdown-menu-right">', '</div>'],
toolbarDropdownItem: '<label class="dropdown-item">%s</label>',
pageDropdown: ['<div class="dropdown-menu">', '</div>'],
pageDropdownItem: '<a class="dropdown-item %s" href="#">%s</a>',
- toolbarDropdownSeperator: '<div class="dropdown-divider"></div>',
+ 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>',
@@ -3665,11 +3667,11 @@
this.contentEl = options.contentEl;
this.callback = options.callback;
this.itemHeight = options.itemHeight;
this.cache = {};
this.scrollTop = this.scrollEl.scrollTop;
- this.initDOM(this.rows);
+ this.initDOM(this.rows, options.fixedScroll);
this.scrollEl.scrollTop = this.scrollTop;
this.lastCluster = 0;
var onScroll = function onScroll() {
if (_this.lastCluster !== (_this.lastCluster = _this.getNum())) {
@@ -3688,17 +3690,18 @@
};
}
_createClass(VirtualScroll, [{
key: "initDOM",
- value: function initDOM(rows) {
+ value: function initDOM(rows, fixedScroll) {
if (typeof this.clusterHeight === 'undefined') {
+ this.cache.scrollTop = this.scrollEl.scrollTop;
this.cache.data = this.contentEl.innerHTML = rows[0] + rows[0] + rows[0];
this.getRowsHeight(rows);
}
- var data = this.initData(rows, this.getNum());
+ var data = this.initData(rows, this.getNum(fixedScroll));
var thisRows = data.rows.join('');
var dataChanged = this.checkChanges('data', thisRows);
var topOffsetChanged = this.checkChanges('top', data.topOffset);
var bottomOffsetChanged = this.checkChanges('bottom', data.bottomOffset);
var html = [];
@@ -3713,10 +3716,14 @@
if (data.bottomOffset) {
html.push(this.getExtra('bottom', data.bottomOffset));
}
this.contentEl.innerHTML = html.join('');
+
+ if (fixedScroll) {
+ this.contentEl.scrollTop = this.cache.scrollTop;
+ }
} else if (bottomOffsetChanged) {
this.contentEl.lastChild.style.height = "".concat(data.bottomOffset, "px");
}
}
}, {
@@ -3732,12 +3739,12 @@
this.clusterRows = BLOCK_ROWS * CLUSTER_BLOCKS;
this.clusterHeight = this.blockHeight * CLUSTER_BLOCKS;
}
}, {
key: "getNum",
- value: function getNum() {
- this.scrollTop = this.scrollEl.scrollTop;
+ value: function getNum(fixedScroll) {
+ this.scrollTop = fixedScroll ? this.cache.scrollTop : this.scrollEl.scrollTop;
return Math.floor(this.scrollTop / (this.clusterHeight - this.blockHeight)) || 0;
}
}, {
key: "initData",
value: function initData(rows, num) {
@@ -4245,11 +4252,10 @@
var o = this.options;
var html = [];
var timeoutId = 0;
var $keepOpen;
- var $search;
var switchableCount = 0;
if (this.$toolbar.find('.bs-bars').children().length) {
$('body').append($(o.toolbar));
}
@@ -4287,11 +4293,11 @@
html.push("<div class=\"keep-open ".concat(this.constants.classes.buttonsDropdown, "\" title=\"").concat(o.formatColumns(), "\">\n <button class=\"").concat(this.constants.buttonsClass, " dropdown-toggle\" type=\"button\" data-toggle=\"dropdown\"\n aria-label=\"Columns\" title=\"").concat(o.formatColumns(), "\">\n ").concat(o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.columns) : '', "\n ").concat(o.showButtonText ? o.formatColumns() : '', "\n ").concat(this.constants.html.dropdownCaret, "\n </button>\n ").concat(this.constants.html.toolbarDropdown[0]));
if (o.showColumnsToggleAll) {
var allFieldsVisible = this.getVisibleColumns().length === this.columns.length;
html.push(Utils.sprintf(this.constants.html.toolbarDropdownItem, Utils.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>', allFieldsVisible ? 'checked="checked"' : '', o.formatColumnsToggleAll())));
- html.push(this.constants.html.toolbarDropdownSeperator);
+ html.push(this.constants.html.toolbarDropdownSeparator);
}
this.columns.forEach(function (column, i) {
if (column.radio || column.checkbox) {
return;
@@ -4373,41 +4379,59 @@
if (o.search || this.showSearchClearButton) {
html = [];
var showSearchButton = Utils.sprintf(this.constants.html.searchButton, this.constants.buttonsClass, o.formatSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.search) : '', o.showButtonText ? o.formatSearch() : '');
var showSearchClearButton = Utils.sprintf(this.constants.html.searchClearButton, this.constants.buttonsClass, o.formatClearSearch(), o.showButtonIcons ? Utils.sprintf(this.constants.html.icon, o.iconsPrefix, o.icons.clearSearch) : '', o.showButtonText ? o.formatClearSearch() : '');
- var searchInputHtml = "<input class=\"".concat(this.constants.classes.input).concat(Utils.sprintf(' input-%s', o.iconSize), " search-input\" type=\"text\" placeholder=\"").concat(o.formatSearch(), "\">");
+ var searchInputHtml = "<input class=\"".concat(this.constants.classes.input, "\n ").concat(Utils.sprintf(' %s%s', this.constants.classes.inputPrefix, o.iconSize), "\n search-input\" type=\"text\" placeholder=\"").concat(o.formatSearch(), "\">");
var searchInputFinalHtml = searchInputHtml;
if (o.showSearchButton || o.showSearchClearButton) {
var buttonsHtml = (o.showSearchButton ? showSearchButton : '') + (o.showSearchClearButton ? showSearchClearButton : '');
searchInputFinalHtml = o.search ? Utils.sprintf(this.constants.html.inputGroup, searchInputHtml, buttonsHtml) : buttonsHtml;
}
html.push(Utils.sprintf("\n <div class=\"".concat(this.constants.classes.pull, "-").concat(o.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');
- $search = o.showSearchButton ? this.$toolbar.find('.search button[name=search]') : $searchInput;
- var eventTriggers = o.showSearchButton ? 'click' : Utils.isIEBrowser() ? 'mouseup' : 'keyup drop blur';
- $search.off(eventTriggers).on(eventTriggers, function (event) {
- if (o.searchOnEnterKey && event.keyCode !== 13) {
- return;
- }
- if ([37, 38, 39, 40].includes(event.keyCode)) {
- return;
- }
+ var handleInputEvent = function handleInputEvent() {
+ var eventTriggers = Utils.isIEBrowser() ? 'mouseup' : 'keyup drop blur';
+ $searchInput.off(eventTriggers).on(eventTriggers, function (event) {
+ if (o.searchOnEnterKey && event.keyCode !== 13) {
+ return;
+ }
- clearTimeout(timeoutId); // doesn't matter if it's 0
+ if ([37, 38, 39, 40].includes(event.keyCode)) {
+ return;
+ }
- timeoutId = setTimeout(function () {
- _this4.onSearch(o.showSearchButton ? {
- currentTarget: $searchInput
- } : event);
- }, o.searchTimeOut);
- });
+ clearTimeout(timeoutId); // doesn't matter if it's 0
+ timeoutId = setTimeout(function () {
+ _this4.onSearch(event);
+ }, o.searchTimeOut);
+ });
+ };
+
+ if (o.showSearchButton) {
+ this.$toolbar.find('.search button[name=search]').off('click').on('click', function (event) {
+ clearTimeout(timeoutId); // doesn't matter if it's 0
+
+ timeoutId = setTimeout(function () {
+ _this4.onSearch({
+ currentTarget: $searchInput
+ });
+ }, o.searchTimeOut);
+ });
+
+ if (o.searchOnEnterKey) {
+ handleInputEvent();
+ }
+ } else {
+ handleInputEvent();
+ }
+
if (o.showSearchClearButton) {
this.$toolbar.find('.search button[name=clearSearch]').click(function () {
_this4.resetSearch();
});
}
@@ -5168,78 +5192,97 @@
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();
+
+ _this8.initBodyEvent();
}
});
}
}
if (!fixedScroll) {
this.scrollTo(0);
- } // click to select by column
+ }
+ this.initBodyEvent();
+ this.updateSelected();
+ this.initFooter();
+ this.resetView();
+ if (this.options.sidePagination !== 'server') {
+ this.options.totalRows = data.length;
+ }
+
+ this.trigger('post-body', data);
+ }
+ }, {
+ key: "initBodyEvent",
+ value: function initBodyEvent() {
+ var _this9 = this;
+
+ // click to select by column
this.$body.find('> tr[data-index] > td').off('click dblclick').on('click dblclick', function (e) {
var $td = $(e.currentTarget);
var $tr = $td.parent();
var $cardViewArr = $(e.target).parents('.card-views').children();
var $cardViewTarget = $(e.target).parents('.card-view');
var rowIndex = $tr.data('index');
- var item = _this8.data[rowIndex];
- var index = _this8.options.cardView ? $cardViewArr.index($cardViewTarget) : $td[0].cellIndex;
+ var item = _this9.data[rowIndex];
+ var index = _this9.options.cardView ? $cardViewArr.index($cardViewTarget) : $td[0].cellIndex;
- var fields = _this8.getVisibleFields();
+ var fields = _this9.getVisibleFields();
- var field = fields[_this8.options.detailView && _this8.detailViewIcon && !_this8.options.cardView ? index - 1 : index];
- var column = _this8.columns[_this8.fieldsColumnsIndex[field]];
- var value = Utils.getItemField(item, field, _this8.options.escape);
+ var field = fields[_this9.options.detailView && _this9.options.detailViewIcon && !_this9.options.cardView ? index - 1 : index];
+ var column = _this9.columns[_this9.fieldsColumnsIndex[field]];
+ var value = Utils.getItemField(item, field, _this9.options.escape);
if ($td.find('.detail-icon').length) {
return;
}
- _this8.trigger(e.type === 'click' ? 'click-cell' : 'dbl-click-cell', field, value, item, $td);
+ _this9.trigger(e.type === 'click' ? 'click-cell' : 'dbl-click-cell', field, value, item, $td);
- _this8.trigger(e.type === 'click' ? 'click-row' : 'dbl-click-row', item, $tr, field); // if click to select - then trigger the checkbox/radio click
+ _this9.trigger(e.type === 'click' ? 'click-row' : 'dbl-click-row', item, $tr, field); // if click to select - then trigger the checkbox/radio click
- if (e.type === 'click' && _this8.options.clickToSelect && column.clickToSelect && !Utils.calculateObjectValue(_this8.options, _this8.options.ignoreClickToSelectOn, [e.target])) {
- var $selectItem = $tr.find(Utils.sprintf('[name="%s"]', _this8.options.selectItemName));
+ if (e.type === 'click' && _this9.options.clickToSelect && column.clickToSelect && !Utils.calculateObjectValue(_this9.options, _this9.options.ignoreClickToSelectOn, [e.target])) {
+ var $selectItem = $tr.find(Utils.sprintf('[name="%s"]', _this9.options.selectItemName));
if ($selectItem.length) {
$selectItem[0].click();
}
}
- if (e.type === 'click' && _this8.options.detailViewByClick) {
- _this8.toggleDetailView(rowIndex, _this8.header.detailFormatters[_this8.fieldsColumnsIndex[field]]);
+ if (e.type === 'click' && _this9.options.detailViewByClick) {
+ _this9.toggleDetailView(rowIndex, _this9.header.detailFormatters[_this9.fieldsColumnsIndex[field]]);
}
}).off('mousedown').on('mousedown', function (e) {
// https://github.com/jquery/jquery/issues/1741
- _this8.multipleSelectRowCtrlKey = e.ctrlKey || e.metaKey;
- _this8.multipleSelectRowShiftKey = e.shiftKey;
+ _this9.multipleSelectRowCtrlKey = e.ctrlKey || e.metaKey;
+ _this9.multipleSelectRowShiftKey = e.shiftKey;
});
this.$body.find('> tr[data-index] > td > .detail-icon').off('click').on('click', function (e) {
e.preventDefault();
- _this8.toggleDetailView($(e.currentTarget).parent().parent().data('index'));
+ _this9.toggleDetailView($(e.currentTarget).parent().parent().data('index'));
return false;
});
this.$selectItem = this.$body.find(Utils.sprintf('[name="%s"]', this.options.selectItemName));
this.$selectItem.off('click').on('click', function (e) {
e.stopImmediatePropagation();
var $this = $(e.currentTarget);
- _this8._toggleCheck($this.prop('checked'), $this.data('index'));
+ _this9._toggleCheck($this.prop('checked'), $this.data('index'));
});
this.header.events.forEach(function (_events, i) {
var events = _events;
if (!events) {
@@ -5249,64 +5292,55 @@
if (typeof events === 'string') {
events = Utils.calculateObjectValue(null, events);
}
- var field = _this8.header.fields[i];
+ var field = _this9.header.fields[i];
- var fieldIndex = _this8.getVisibleFields().indexOf(field);
+ var fieldIndex = _this9.getVisibleFields().indexOf(field);
if (fieldIndex === -1) {
return;
}
- if (_this8.options.detailView && !_this8.options.cardView) {
+ if (_this9.options.detailView && !_this9.options.cardView) {
fieldIndex += 1;
}
var _loop = function _loop(key) {
if (!events.hasOwnProperty(key)) {
return "continue";
}
var event = events[key];
- _this8.$body.find('>tr:not(.no-records-found)').each(function (i, tr) {
+ _this9.$body.find('>tr:not(.no-records-found)').each(function (i, tr) {
var $tr = $(tr);
- var $td = $tr.find(_this8.options.cardView ? '.card-views>.card-view' : '>td').eq(fieldIndex);
+ var $td = $tr.find(_this9.options.cardView ? '.card-views>.card-view' : '>td').eq(fieldIndex);
var index = key.indexOf(' ');
var name = key.substring(0, index);
var el = key.substring(index + 1);
$td.find(el).off(name).on(name, function (e) {
var index = $tr.data('index');
- var row = _this8.data[index];
+ var row = _this9.data[index];
var value = row[field];
- event.apply(_this8, [e, value, row, index]);
+ event.apply(_this9, [e, value, row, index]);
});
});
};
for (var key in events) {
var _ret = _loop(key);
if (_ret === "continue") continue;
}
});
- this.updateSelected();
- this.initFooter();
- this.resetView();
-
- if (this.options.sidePagination !== 'server') {
- this.options.totalRows = data.length;
- }
-
- this.trigger('post-body', data);
}
}, {
key: "initServer",
value: function initServer(silent, query, url) {
- var _this9 = this;
+ var _this10 = this;
var data = {};
var index = this.header.fields.indexOf(this.options.sortName);
var params = {
searchText: this.searchText,
@@ -5364,35 +5398,35 @@
url: url || this.options.url,
data: this.options.contentType === 'application/json' && this.options.method === 'post' ? JSON.stringify(data) : data,
cache: this.options.cache,
contentType: this.options.contentType,
dataType: this.options.dataType,
- success: function success(_res) {
- var res = Utils.calculateObjectValue(_this9.options, _this9.options.responseHandler, [_res], _res);
+ success: function success(_res, textStatus, jqXHR) {
+ var res = Utils.calculateObjectValue(_this10.options, _this10.options.responseHandler, [_res, jqXHR], _res);
- _this9.load(res);
+ _this10.load(res);
- _this9.trigger('load-success', res);
+ _this10.trigger('load-success', res, jqXHR.status, jqXHR);
if (!silent) {
- _this9.hideLoading();
+ _this10.hideLoading();
}
},
error: function error(jqXHR) {
var data = [];
- if (_this9.options.sidePagination === 'server') {
+ if (_this10.options.sidePagination === 'server') {
data = {};
- data[_this9.options.totalField] = 0;
- data[_this9.options.dataField] = [];
+ data[_this10.options.totalField] = 0;
+ data[_this10.options.dataField] = [];
}
- _this9.load(data);
+ _this10.load(data);
- _this9.trigger('load-error', jqXHR.status, jqXHR);
+ _this10.trigger('load-error', jqXHR.status, jqXHR);
- if (!silent) _this9.$tableLoading.hide();
+ if (!silent) _this10.$tableLoading.hide();
}
});
if (this.options.ajax) {
Utils.calculateObjectValue(this, this.options.ajax, [request], null);
@@ -5423,14 +5457,14 @@
}
}
}, {
key: "getCaret",
value: function getCaret() {
- var _this10 = this;
+ var _this11 = this;
this.$header.find('th').each(function (i, th) {
- $(th).find('.sortable').removeClass('desc asc').addClass($(th).data('field') === _this10.options.sortName ? _this10.options.sortOrder : 'both');
+ $(th).find('.sortable').removeClass('desc asc').addClass($(th).data('field') === _this11.options.sortName ? _this11.options.sortOrder : 'both');
});
}
}, {
key: "updateSelected",
value: function updateSelected() {
@@ -5441,14 +5475,14 @@
});
}
}, {
key: "updateRows",
value: function updateRows() {
- var _this11 = this;
+ var _this12 = this;
this.$selectItem.each(function (i, el) {
- _this11.data[$(el).data('index')][_this11.header.stateField] = $(el).prop('checked');
+ _this12.data[$(el).data('index')][_this12.header.stateField] = $(el).prop('checked');
});
}
}, {
key: "resetRows",
value: function resetRows() {
@@ -5501,27 +5535,27 @@
this.$el.trigger($.Event('all.bs.table'), [name, args]);
}
}, {
key: "resetHeader",
value: function resetHeader() {
- var _this12 = this;
+ var _this13 = this;
// fix #61: the hidden table reset header bug.
// fix bug: get $el.css('width') error sometime (height = 500)
clearTimeout(this.timeoutId_);
this.timeoutId_ = setTimeout(function () {
- return _this12.fitHeader();
+ return _this13.fitHeader();
}, this.$el.is(':hidden') ? 100 : 0);
}
}, {
key: "fitHeader",
value: function fitHeader() {
- var _this13 = this;
+ var _this14 = this;
if (this.$el.is(':hidden')) {
this.timeoutId_ = setTimeout(function () {
- return _this13.fitHeader();
+ return _this14.fitHeader();
}, 100);
return;
}
var fixedBody = this.$tableBody.get(0);
@@ -5556,11 +5590,11 @@
this.$header.find('.focus-temp').removeClass('focus-temp');
} // fix bug: $.data() is not working as expected after $.append()
this.$header.find('th[data-field]').each(function (i, el) {
- _this13.$header_.find(Utils.sprintf('th[data-field="%s"]', $(el).data('field'))).data($(el).data());
+ _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', $(el).data('field'))).data($(el).data());
});
var visibleFields = this.getVisibleFields();
var $ths = this.$header_.find('th');
var $tr = this.$body.find('>tr:not(.no-records-found,.virtual-scroll-top)').eq(0);
@@ -5570,11 +5604,11 @@
$tr.find('> *').each(function (i, el) {
var $this = $(el);
var index = i;
- if (_this13.options.detailView && _this13.options.detailViewIcon && !_this13.options.cardView) {
+ if (_this14.options.detailView && _this14.options.detailViewIcon && !_this14.options.cardView) {
if (i === 0) {
var $thDetail = $ths.filter('.detail');
var _zoomWidth = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
@@ -5586,11 +5620,11 @@
if (index === -1) {
return;
}
- var $th = _this13.$header_.find(Utils.sprintf('th[data-field="%s"]', visibleFields[index]));
+ var $th = _this14.$header_.find(Utils.sprintf('th[data-field="%s"]', visibleFields[index]));
if ($th.length > 1) {
$th = $($ths[$this[0].cellIndex]);
}
@@ -5681,15 +5715,15 @@
this.trigger('post-footer', this.$tableFooter);
}
}, {
key: "fitFooter",
value: function fitFooter() {
- var _this14 = this;
+ var _this15 = this;
if (this.$el.is(':hidden')) {
setTimeout(function () {
- return _this14.fitFooter();
+ return _this15.fitFooter();
}, 100);
return;
}
var fixedBody = this.$tableBody.get(0);
@@ -5705,11 +5739,11 @@
$tr.find('> *').each(function (i, el) {
var $this = $(el);
var index = i;
- if (_this14.options.detailView && !_this14.options.cardView) {
+ if (_this15.options.detailView && !_this15.options.cardView) {
if (i === 0) {
var $thDetail = $ths.filter('.detail');
var _zoomWidth2 = $thDetail.innerWidth() - $thDetail.find('.fht-cell').width();
@@ -5730,25 +5764,26 @@
this.horizontalScroll();
}
}, {
key: "horizontalScroll",
value: function horizontalScroll() {
- var _this15 = this;
+ var _this16 = this;
// horizontal scroll event
// TODO: it's probably better improving the layout than binding to scroll event
- this.trigger('scroll-body');
this.$tableBody.off('scroll').on('scroll', function (_ref6) {
var currentTarget = _ref6.currentTarget;
- if (_this15.options.showHeader && _this15.options.height) {
- _this15.$tableHeader.scrollLeft($(currentTarget).scrollLeft());
+ if (_this16.options.showHeader && _this16.options.height) {
+ _this16.$tableHeader.scrollLeft($(currentTarget).scrollLeft());
}
- if (_this15.options.showFooter && !_this15.options.cardView) {
- _this15.$tableFooter.scrollLeft($(currentTarget).scrollLeft());
+ if (_this16.options.showFooter && !_this16.options.cardView) {
+ _this16.$tableFooter.scrollLeft($(currentTarget).scrollLeft());
}
+
+ _this16.trigger('scroll-body', $(currentTarget));
});
}
}, {
key: "getVisibleFields",
value: function getVisibleFields() {
@@ -5836,24 +5871,24 @@
return data;
}
}, {
key: "getSelections",
value: function getSelections() {
- var _this16 = this;
+ var _this17 = this;
// fix #2424: from html with checkbox
return this.data.filter(function (row) {
- return row[_this16.header.stateField] === true;
+ return row[_this17.header.stateField] === true;
});
}
}, {
key: "getAllSelections",
value: function getAllSelections() {
- var _this17 = this;
+ var _this18 = this;
return this.options.data.filter(function (row) {
- return row[_this17.header.stateField] === true;
+ return row[_this18.header.stateField] === true;
});
}
}, {
key: "load",
value: function load(_data) {
@@ -6121,11 +6156,11 @@
this.initBody(true);
}
}, {
key: "updateCellByUniqueId",
value: function updateCellByUniqueId(params) {
- var _this18 = this;
+ var _this19 = this;
if (!params.hasOwnProperty('id') || !params.hasOwnProperty('field') || !params.hasOwnProperty('value')) {
return;
}
@@ -6133,17 +6168,17 @@
allParams.forEach(function (_ref7) {
var id = _ref7.id,
field = _ref7.field,
value = _ref7.value;
- var rowId = _this18.options.data.indexOf(_this18.getRowByUniqueId(id));
+ var rowId = _this19.options.data.indexOf(_this19.getRowByUniqueId(id));
if (rowId === -1) {
return;
}
- _this18.options.data[rowId][field] = value;
+ _this19.options.data[rowId][field] = value;
});
if (params.reinit === false) {
return;
}
@@ -6233,25 +6268,25 @@
return rows;
}
}, {
key: "showColumn",
value: function showColumn(field) {
- var _this19 = this;
+ var _this20 = this;
var fields = Array.isArray(field) ? field : [field];
fields.forEach(function (field) {
- _this19._toggleColumn(_this19.fieldsColumnsIndex[field], true, true);
+ _this20._toggleColumn(_this20.fieldsColumnsIndex[field], true, true);
});
}
}, {
key: "hideColumn",
value: function hideColumn(field) {
- var _this20 = this;
+ var _this21 = this;
var fields = Array.isArray(field) ? field : [field];
fields.forEach(function (field) {
- _this20._toggleColumn(_this20.fieldsColumnsIndex[field], false, true);
+ _this21._toggleColumn(_this21.fieldsColumnsIndex[field], false, true);
});
}
}, {
key: "_toggleColumn",
value: function _toggleColumn(index, checked, needUpdate) {
@@ -6304,11 +6339,11 @@
this._toggleAllColumns(false);
}
}, {
key: "_toggleAllColumns",
value: function _toggleAllColumns(visible) {
- var _this21 = this;
+ var _this22 = this;
var _iteratorNormalCompletion8 = true;
var _didIteratorError8 = false;
var _iteratorError8 = undefined;
@@ -6349,11 +6384,11 @@
if (visible) {
$items.prop('checked', visible);
} else {
$items.get().reverse().forEach(function (item) {
- if ($items.filter(':checked').length > _this21.options.minimumCountColumns) {
+ if ($items.filter(':checked').length > _this22.options.minimumCountColumns) {
$(item).prop('checked', visible);
}
});
}
@@ -6507,11 +6542,11 @@
this._toggleCheckBy(false, obj);
}
}, {
key: "_toggleCheckBy",
value: function _toggleCheckBy(checked, obj) {
- var _this22 = this;
+ var _this23 = this;
if (!obj.hasOwnProperty('field') || !obj.hasOwnProperty('values')) {
return;
}
@@ -6520,23 +6555,23 @@
if (!row.hasOwnProperty(obj.field)) {
return false;
}
if (obj.values.includes(row[obj.field])) {
- var $el = _this22.$selectItem.filter(':enabled').filter(Utils.sprintf('[data-index="%s"]', i));
+ var $el = _this23.$selectItem.filter(':enabled').filter(Utils.sprintf('[data-index="%s"]', i));
$el = checked ? $el.not(':checked') : $el.filter(':checked');
if (!$el.length) {
return;
}
$el.prop('checked', checked);
- row[_this22.header.stateField] = checked;
+ row[_this23.header.stateField] = checked;
rows.push(row);
- _this22.trigger(checked ? 'check' : 'uncheck', row, $el);
+ _this23.trigger(checked ? 'check' : 'uncheck', row, $el);
}
});
this.updateSelected();
this.trigger(checked ? 'check-some' : 'uncheck-some', rows);
}
@@ -6579,10 +6614,10 @@
this.$tableContainer.toggleClass('has-card-view', this.options.cardView);
if (!this.options.cardView && this.options.showHeader && this.options.height) {
this.$tableHeader.show();
this.resetHeader();
- padding += this.$header.outerHeight(true);
+ padding += this.$header.outerHeight(true) + 1;
} else {
this.$tableHeader.hide();
this.trigger('post-header');
}