Skip to content

make work with jquery 3 #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
plockaby wants to merge 3 commits into
base: master
Choose a base branch
from
Open

make work with jquery 3 #3

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9e85769
make work with jquery 3
plockaby Oct 7, 2017
e91ff5a
jshint warnings
plockaby Oct 7, 2017
58bf303
make automatically sort when the table changes
plockaby Oct 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 22 additions & 13 deletions bootstrap-table-multiple-sort.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,10 @@

var isSingleSort = false;

var showSortModal = function(that) {
var _selector = that.$sortModal.selector,
_id = _selector.substr(1);
var showSortModal = function(that, sortModalId) {
var _id = sortModalId.substr(1);

if (!$(_id).hasClass("modal")) {
if (!$(_id).hasClass('modal')) {
var sModal = ' <div class="modal fade" id="' + _id + '" tabindex="-1" role="dialog" aria-labelledby="' + _id + 'Label" aria-hidden="true">';
sModal += ' <div class="modal-dialog">';
sModal += ' <div class="modal-content">';
Expand Down Expand Up @@ -56,7 +55,7 @@

$('body').append($(sModal));

that.$sortModal = $(_selector);
that.$sortModal = $(sortModalId);
var $rows = that.$sortModal.find('tbody > tr');

that.$sortModal.off('click', '#add').on('click', '#add', function() {
Expand Down Expand Up @@ -104,7 +103,7 @@
var sorted_fields = fields.sort();

for (var i = 0; i < fields.length - 1; i++) {
if (sorted_fields[i + 1] == sorted_fields[i]) {
if (sorted_fields[i + 1] === sorted_fields[i]) {
results.push(sorted_fields[i]);
}
}
Expand Down Expand Up @@ -224,8 +223,18 @@
$.extend($.fn.bootstrapTable.defaults, $.fn.bootstrapTable.locales);

var BootstrapTable = $.fn.bootstrapTable.Constructor,
_initSort = BootstrapTable.prototype.initSort,
_initToolbar = BootstrapTable.prototype.initToolbar;

BootstrapTable.prototype.initSort = function() {
var that = this;
if (!isSingleSort && that.options.sortPriority !== null && typeof that.options.sortPriority === 'object') {
that.onMultipleSort();
} else {
_initSort.apply(this, Array.prototype.slice.apply(arguments));
}
}

BootstrapTable.prototype.initToolbar = function() {
this.showToolbar = true;
var that = this,
Expand All @@ -245,7 +254,7 @@

$btnGroup.append($multiSortBtn);

showSortModal(that);
showSortModal(that, sortModalId);
}

this.$el.on('sort.bs.table', function() {
Expand All @@ -271,7 +280,7 @@

that.assignSortableArrows();
that.$sortModal.remove();
showSortModal(that);
showSortModal(that, sortModalId);
});

this.$el.on('reset-view.bs.table', function() {
Expand Down Expand Up @@ -355,8 +364,8 @@
});

if (sortPriority !== undefined) {
$multiSortName.find('option[value="' + sortPriority.sortName + '"]').attr("selected", true);
$multiSortOrder.find('option[value="' + sortPriority.sortOrder + '"]').attr("selected", true);
$multiSortName.find('option[value="' + sortPriority.sortName + '"]').attr('selected', true);
$multiSortOrder.find('option[value="' + sortPriority.sortOrder + '"]').attr('selected', true);
}
};

Expand All @@ -377,7 +386,7 @@
var total = this.$sortModal.find('.multi-sort-name:first option').length,
current = this.$sortModal.find('tbody tr').length;

if (current == total) {
if (current === total) {
this.$sortModal.find('#add').attr('disabled', 'disabled');
}
if (current > 1) {
Expand All @@ -386,8 +395,8 @@
if (current < total) {
this.$sortModal.find('#add').removeAttr('disabled');
}
if (current == 1) {
if (current === 1) {
this.$sortModal.find('#delete').attr('disabled', 'disabled');
}
};
})(jQuery);
})(jQuery);