Skip to content

Commit 1b8ee47

Browse files
committed
remove references to deprecated config.headerList
1 parent ca26328 commit 1b8ee47

1 file changed

Lines changed: 13 additions & 13 deletions

File tree

app/sprinkles/core/assets/userfrosting/js/uf-table.js

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@
171171
function Plugin (element, options) {
172172
this.element = element[0];
173173
this.$element = $(this.element);
174+
var tableElement = this.$element.find('.tablesorter');
175+
174176
var lateDefaults = {
175177
downloadButton: this.$element.find('.js-uf-table-download'),
176178
onDownload: $.proxy(this._onDownload, this),
@@ -246,8 +248,6 @@
246248
// Copy over dataUrl to pager_ajaxUrl
247249
this.settings.tablesorter.widgetOptions.pager_ajaxUrl = this.settings.dataUrl;
248250

249-
var tableElement = this.$element.find('.tablesorter');
250-
251251
// Set up 'loading' overlays
252252
if (this.settings.useLoadingTransition) {
253253
var overlay = this.settings.overlay.container;
@@ -262,14 +262,14 @@
262262
this.ts = tableElement.tablesorter(this.settings.tablesorter);
263263

264264
// Map default column template selectors based on data-column-template attribute in each column header
265-
var columns = this.ts[0].config.headerList;
265+
var columns = this.ts[0].config.$headerIndexed;
266266
var columnTemplates = {};
267267
for (var col = 0; col < columns.length; col++) {
268-
var columnName = $(columns[col]).data('column-name');
268+
var columnName = columns[col].data('column-name');
269269
if (!columnName && this.settings.DEBUG) {
270270
console.error('Column number ' + col + ' is missing a data-column-name attribute.');
271271
}
272-
columnTemplates[columnName] = $(columns[col]).data('column-template');
272+
columnTemplates[columnName] = columns[col].data('column-template');
273273
}
274274

275275
// Merge in any column template selectors that were set in the ctor options
@@ -279,7 +279,7 @@
279279
// At the same time, build out a numerically indexed array of templates
280280
this.columnTemplates = [];
281281
for (var col = 0; col < columns.length; col++) {
282-
var columnName = $(columns[col]).data('column-name');
282+
var columnName = columns[col].data('column-name');
283283
if (!columnTemplates[columnName] && this.settings.DEBUG) {
284284
console.error("No template found for column '" + columnName + "'.");
285285
}
@@ -336,7 +336,7 @@
336336
var columnIndex = sortList[i][0];
337337
var columnDirection = sortOrders[sortList[i][1]]; // Converts to 'asc' or 'desc'
338338
if (sortList[i]) {
339-
var columnName = $(table.config.headerList[columnIndex]).data('column-name');
339+
var columnName = table.config.$headerIndexed[columnIndex].data('column-name');
340340
sorts[columnName] = columnDirection;
341341
}
342342
}
@@ -348,8 +348,8 @@
348348
if (filterList[i]) {
349349
var columnName = base.settings.filterAllField;
350350

351-
if (table.config.headerList[i]) {
352-
columnName = $(table.config.headerList[i]).data('column-name');
351+
if (table.config.$headerIndexed[i]) {
352+
columnName = table.config.$headerIndexed[i].data('column-name');
353353
}
354354

355355
filters[columnName] = filterList[i];
@@ -428,7 +428,6 @@
428428
}
429429

430430
// Render table rows and cells via Handlebars
431-
var columns = ts.config.headerList;
432431
for (var row = 0; row < size; row++) {
433432
var cellData = {
434433
rownum: row,
@@ -438,14 +437,15 @@
438437

439438
rows += rowTemplate(cellData);
440439

441-
for (var col = 0; col < columns.length; col++) {
440+
for (var col = 0; col < this.columnTemplates.length; col++) {
442441
rows += this.columnTemplates[col](cellData);
443442
}
444443

445444
rows += '</tr>';
446445
}
447446

448-
// Initialize any dropdown filters
447+
// Initialize any dropdown filters
448+
var columns = ts.config.$headerIndexed;
449449
this._ajaxInitFilterSelects(columns, data.listable);
450450

451451
json.total = data.count; // Get total rows without pagination
@@ -470,7 +470,7 @@
470470
var filters = this.getSavedFilters(ts);
471471
// Find columns with `.filter-select` and match them to column numbers based on their data-column-name
472472
for (var col = 0; col < columns.length; col++) {
473-
var column = $(columns[col]);
473+
var column = columns[col];
474474
// If the column is designated for filter-select, get the listables from the data and recreate it
475475
if (column.hasClass('filter-select')) {
476476
var columnName = column.data('column-name');

0 commit comments

Comments
 (0)