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 2020/01/19 04:32:13 UTC

[sling-org-apache-sling-app-cms] branch master updated (772c6da -> 23d6a44)

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 772c6da  Fixing SLING-9000 - Fixing undefined JavaScript variable
     new 0d4f441  Minor - Removing unneeded configuration type
     new 23d6a44  Fixing issue created by SLING-8919

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.form.js                         | 13 +++++++------
 .../jcr_root/libs/sling-cms/components/caconfig/site.json   |  5 -----
 2 files changed, 7 insertions(+), 11 deletions(-)
 delete mode 100644 ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/site.json


[sling-org-apache-sling-app-cms] 01/02: Minor - Removing unneeded configuration type

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 0d4f44132d627a71777dd8e162a99c95691c6b33
Author: Dan Klco <dk...@apache.org>
AuthorDate: Thu Jan 16 14:18:10 2020 -0600

    Minor - Removing unneeded configuration type
---
 .../resources/jcr_root/libs/sling-cms/components/caconfig/site.json  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/site.json b/ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/site.json
deleted file mode 100644
index beab406..0000000
--- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/caconfig/site.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-	"jcr:primaryType": "sling:Component",
-	"jcr:title": "Sling CMS - Site Configuration",
-    "componentType": "SlingCMS-Config"
-}
\ No newline at end of file


[sling-org-apache-sling-app-cms] 02/02: Fixing issue created by SLING-8919

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 23d6a4436a82033fa7fc6532166bdd0c7d50ed29
Author: Dan Klco <dk...@apache.org>
AuthorDate: Sat Jan 18 23:31:47 2020 -0500

    Fixing issue created by SLING-8919
---
 ui/src/main/frontend/js/cms.form.js | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/ui/src/main/frontend/js/cms.form.js b/ui/src/main/frontend/js/cms.form.js
index ed221fc..7eb1dec 100644
--- a/ui/src/main/frontend/js/cms.form.js
+++ b/ui/src/main/frontend/js/cms.form.js
@@ -102,8 +102,8 @@ rava.bind('.get-form', {
       const modal = Sling.CMS.ui.loaderModal('Loading...');
       const form = this;
       const wrapper = form.querySelector('.form-wrapper');
-      async function doGet() {
-        const request = await fetch(`${form.action}?${new URLSearchParams(new FormData(form)).toString()}`);
+      async function doGet(url) {
+        const request = await fetch(url);
         if (Sling.CMS.utils.ok(request)) {
           const tmp = document.createElement('div');
           tmp.innerHTML = await request.text();
@@ -117,11 +117,12 @@ rava.bind('.get-form', {
         } else {
           modal.remove();
         }
-        if (wrapper) {
-          wrapper.disabled = true;
-        }
       }
-      doGet();
+      const url = `${form.action}?${new URLSearchParams(new FormData(form)).toString()}`;
+      if (wrapper) {
+        wrapper.disabled = true;
+      }
+      doGet(url);
     },
   },
 });