Skip to content

Commit

Permalink
Merge pull request #7479 from abpframework/issue/7183
Browse files Browse the repository at this point in the history
Datatables pagination: use "col-auto"
  • Loading branch information
hikalkan authored Jan 27, 2021
2 parents 7034bcd + afb9175 commit 7e902d7
Showing 1 changed file with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
var htmlEncode = function (html) {
return $('<div/>').text(html).html();
}

var _createDropdownItem = function (record, fieldItem, tableInstance) {
var $li = $('<li/>');
var $a = $('<a/>');
Expand Down Expand Up @@ -90,15 +90,15 @@
}
$button.append(htmlEncode(firstItem.text));
}

if (firstItem.enabled && !firstItem.enabled({ record: record, table: tableInstance })) {
$button.addClass('disabled');
}

if (firstItem.action) {
$button.click(function (e) {
e.preventDefault();

if (!$(this).hasClass('disabled')) {
if (firstItem.confirmMessage) {
abp.message.confirm(firstItem.confirmMessage({ record: record, table: tableInstance }))
Expand Down Expand Up @@ -217,7 +217,7 @@

var renderRowActions = function (tableInstance, nRow, aData, iDisplayIndex, iDisplayIndexFull) {
var columns;

if (tableInstance.aoColumns) {
columns = tableInstance.aoColumns;
} else {
Expand Down Expand Up @@ -463,7 +463,7 @@

datatables.defaultConfigurations.scrollX = true;

datatables.defaultConfigurations.responsive = true;
datatables.defaultConfigurations.responsive = true;

datatables.defaultConfigurations.language = function () {
return {
Expand All @@ -484,6 +484,6 @@
};
};

datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto"i><"col"p>>';
datatables.defaultConfigurations.dom = '<"dataTable_filters"f>rt<"row dataTable_footer"<"col-auto"l><"col-auto mr-auto"i><"col-auto"p>>';

})(jQuery);

0 comments on commit 7e902d7

Please sign in to comment.