Skip to content

Commit a10a6b0

Browse files
committed
Don't reload the page on rowclick if whitespace
Don't check a select checkbox if disabled
1 parent dd3842d commit a10a6b0

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Griddly/Scripts/griddly.js

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -324,14 +324,14 @@
324324

325325
$(this.$element).on("mouseup", "tbody.data tr td:not(:has(input))", $.proxy(function (e)
326326
{
327-
var url = $(e.target).parents("tr").data("griddly-url");
327+
var url = $.trim($(e.target).parents("tr").data("griddly-url"));
328328

329329
if (url && $(e.target).closest("a").length == 0)
330330
{
331331
if (this.options.rowClickModal)
332332
{
333333
$(this.options.rowClickModal).removeData("bs.modal").modal({ show: false });
334-
$(".modal-content", this.options.rowClickModal).load($.trim(url), $.proxy(function (event)
334+
$(".modal-content", this.options.rowClickModal).load(url, $.proxy(function (event)
335335
{
336336
$(this.options.rowClickModal).modal("show");
337337
}, this));
@@ -350,7 +350,7 @@
350350

351351
$(this.$element).on("mousedown", "tbody.data tr td:not(:has(input))", $.proxy(function (e)
352352
{
353-
var url = $(e.target).parents("tr").data("griddly-url");
353+
var url = $.trim($(e.target).parents("tr").data("griddly-url"));
354354

355355
if (url)
356356
e.preventDefault();
@@ -474,7 +474,10 @@
474474
{
475475
$checkbox = $target.find("input[name=_rowselect]");
476476

477-
$checkbox.prop("checked", !$checkbox.prop("checked"));
477+
if (!$checkbox.prop("disabled"))
478+
{
479+
$checkbox.prop("checked", !$checkbox.prop("checked"));
480+
}
478481
}
479482

480483
setRowSelect($checkbox);

0 commit comments

Comments
 (0)