slickgrid
Advanced tools
Comparing version 2.4.38 to 2.4.39
@@ -9,8 +9,31 @@ (function ($) { | ||
showCountText: "From {countBegin} to {countEnd} of {rowCount} rows", | ||
showCount: false | ||
showCount: false, | ||
pagingOptions:[ | ||
{ | ||
data: 0, | ||
name: "All" | ||
}, | ||
{ | ||
data: -1, | ||
name: "Auto" | ||
}, | ||
{ | ||
data: 25, | ||
name: "25" | ||
}, | ||
{ | ||
data: 50, | ||
name: "50" | ||
}, | ||
{ | ||
data: 100, | ||
name: "100" | ||
} | ||
], | ||
showPageSizes: false | ||
}; | ||
function init() { | ||
_options = $.extend(true, {}, _defaults, options); | ||
dataView.onPagingInfoChanged.subscribe(function (e, pagingInfo) { | ||
@@ -79,4 +102,24 @@ updatePager(pagingInfo); | ||
var pagingOptions = ''; | ||
for (var o = 0; o < _options.pagingOptions.length; o++) | ||
{ | ||
var p = _options.pagingOptions[o]; | ||
pagingOptions += "<a data=" +p.data + ">" + p.name + "</a>"; | ||
} | ||
pagingOptions = $("<span class='slick-pager-settings-expanded'>Show: " + pagingOptions + "</span>"); | ||
if (_options.showPageSizes) | ||
{ | ||
pagingOptions.show(); | ||
} | ||
else | ||
{ | ||
pagingOptions.hide(); | ||
} | ||
$settings | ||
.append("<span class='slick-pager-settings-expanded' style='display:none'>Show: <a data=0>All</a><a data='-1'>Auto</a><a data=25>25</a><a data=50>50</a><a data=100>100</a></span>"); | ||
.append(pagingOptions); | ||
@@ -83,0 +126,0 @@ $settings.find("a[data]").click(function (e) { |
{ | ||
"name": "slickgrid", | ||
"version": "2.4.38", | ||
"version": "2.4.39", | ||
"description": "A lightning fast JavaScript grid/spreadsheet", | ||
@@ -37,6 +37,6 @@ "main": "slick.core.js", | ||
"devDependencies": { | ||
"cypress": "^7.6.0", | ||
"eslint": "^7.29.0", | ||
"http-server": "^0.12.3" | ||
"cypress": "^8.3.1", | ||
"eslint": "^7.32.0", | ||
"http-server": "^13.0.1" | ||
} | ||
} |
@@ -183,4 +183,4 @@ (function ($) { | ||
if (menu.tooltip) { | ||
$el.attr("title", menu.tooltip); | ||
if (options.tooltip) { | ||
$el.attr("title", options.tooltip); | ||
} | ||
@@ -306,4 +306,4 @@ | ||
var gridPos = _grid.getGridPosition(); | ||
if ((leftPos + options.minWidth) >= gridPos.width) { | ||
leftPos = leftPos - options.minWidth + options.autoAlignOffset; | ||
if ((leftPos + $menu.width()) >= gridPos.width) { | ||
leftPos = leftPos + $menuButton.outerWidth() - $menu.outerWidth() + options.autoAlignOffset; | ||
} | ||
@@ -310,0 +310,0 @@ } |
@@ -94,7 +94,9 @@ (function ($) { | ||
function endUpdate() { | ||
if (isBulkSuspend) { | ||
var wasBulkSuspend = isBulkSuspend; | ||
isBulkSuspend = false; | ||
suspend = false; | ||
if (wasBulkSuspend) { | ||
processBulkDelete(); | ||
ensureIdUniqueness(); | ||
} | ||
isBulkSuspend = false; | ||
suspend = false; | ||
refresh(); | ||
@@ -188,2 +190,5 @@ } | ||
function ensureIdUniqueness() { | ||
if (isBulkSuspend) { // during bulk update we do not reorganize | ||
return; | ||
} | ||
var id; | ||
@@ -190,0 +195,0 @@ for (var i = 0, l = items.length; i < l; i++) { |
Sorry, the diff of this file is too big to display
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
4573298
101356