From af0f342c3b641bd05a3b6c6d594cd94073c1b91e Mon Sep 17 00:00:00 2001 From: Martin Portevin Date: Sun, 14 Jan 2018 08:44:17 +0100 Subject: [PATCH 1/2] Fix stopPropagation on click if no GridFieldEditableColumns stopPropagation shouldn't fire if no GridFieldEditableColumns was added. It forces user to click on edit button on the far right instead of directly being able to click anywhere on the row. --- javascript/GridFieldExtensions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/javascript/GridFieldExtensions.js b/javascript/GridFieldExtensions.js index d961716..2c2f478 100644 --- a/javascript/GridFieldExtensions.js +++ b/javascript/GridFieldExtensions.js @@ -250,7 +250,7 @@ * GridFieldEditableColumns */ - $('.grid-field .ss-gridfield-item').entwine({ + $('.ss-gridfield-editable .ss-gridfield-item').entwine({ onclick: function(e) { // Prevent the default row click action when clicking a cell that contains a field if (this.find('.editable-column-field').length) { From e67065a780c3ddfe65abcdae83a651e33d6a28b9 Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Fri, 26 Jan 2018 12:05:25 +1300 Subject: [PATCH 2/2] Update branch alias for 3.2.x-dev --- composer.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9a7228c..c43221d 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,6 @@ "silverstripe/versioned": "^1@dev" }, "extra": { - "installer-name": "gridfieldextensions", "screenshots": [ "docs/en/_images/editable-rows.png", "docs/en/_images/add-existing-search.png" @@ -36,7 +35,10 @@ "expose": [ "css", "javascript" - ] + ], + "branch-alias": { + "3.x-dev": "3.2.x-dev" + } }, "replace": { "ajshort/silverstripe-gridfieldextensions": "self.version",