You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2019/12/27 14:58:21 UTC
[sling-org-apache-sling-app-cms] branch master updated (d69d589 ->
1e7a0d2)
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git.
from d69d589 Fixes SLING-8952: Using tags instead of buttons for the labelfield
new d035a8d Fixes part of SLING-8953 - fixing issue where the loader doesn't close when closing search from a pathfield
new 1e7a0d2 Fixes SLING-8953 - fixing issue where closing search closes the page properties dialog
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
ui/src/main/frontend/js/cms.modal.js | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
[sling-org-apache-sling-app-cms] 02/02: Fixes SLING-8953 - fixing
issue where closing search closes the page properties dialog
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 1e7a0d29a52da96a2c7ee9bb4827bffeb3e5b267
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Dec 26 22:48:14 2019 -0500
Fixes SLING-8953 - fixing issue where closing search closes the page properties dialog
---
ui/src/main/frontend/js/cms.modal.js | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/ui/src/main/frontend/js/cms.modal.js b/ui/src/main/frontend/js/cms.modal.js
index 987f846..5c19e37 100644
--- a/ui/src/main/frontend/js/cms.modal.js
+++ b/ui/src/main/frontend/js/cms.modal.js
@@ -57,13 +57,15 @@ rava.bind('a.Fetch-Modal', {
},
});
-rava.bind('.modal', {
+rava.bind('.close,.modal-close,.close-modal,.modal-background', {
events: {
- '.close,.modal-close,.close-modal,.modal-background': {
- click(event) {
- event.preventDefault();
- this.remove();
- },
+ click(evt) {
+ const modal = this.closest('.modal');
+ if (modal) {
+ evt.preventDefault();
+ evt.stopPropagation();
+ modal.remove();
+ }
},
},
});
[sling-org-apache-sling-app-cms] 01/02: Fixes part of SLING-8953 -
fixing issue where the loader doesn't close when closing search from a
pathfield
Posted by dk...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit d035a8d00bfac9913371f209998a8bd49891d907
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Dec 26 22:47:43 2019 -0500
Fixes part of SLING-8953 - fixing issue where the loader doesn't close when closing search from a pathfield
---
ui/src/main/frontend/js/cms.modal.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/ui/src/main/frontend/js/cms.modal.js b/ui/src/main/frontend/js/cms.modal.js
index 4752b60..987f846 100644
--- a/ui/src/main/frontend/js/cms.modal.js
+++ b/ui/src/main/frontend/js/cms.modal.js
@@ -49,6 +49,7 @@ rava.bind('a.Fetch-Modal', {
title,
}, window.location.origin);
button.removeAttribute('disabled');
+ modal.remove();
} else {
loadModal();
}