Merge pull request #414 from wttech/crypto-button

added 'Protect Text' button to script editor
wttech · Oct 19, 2023 · 8aace96 · 8aace96
2 parents 0d237d5 + 7c80e86
commit 8aace96
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 31 deletions.
diff --git a/.../ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js b/.../ui.apps.base/src/main/content/jcr_root/apps/apm/clientlibs/views/editor/js/apm-editor.js
@@ -51,6 +51,7 @@
       this.$textArea = this.$el.find('#cqsm').eq(0);
       this.$fileName = this.$el.find('#fname').eq(0);
       this.$validateButton = this.$el.find('#validateButton').eq(0);
+      this.$cryptoButton = this.$el.find('#cryptoButton').eq(0);
       this.$saveButton = this.$el.find('#saveButton').eq(0);
       this.$saveAndCloseButton = this.$el.find('#saveAndCloseButton').eq(0);
       this.initialValue = this.$textArea.val();
@@ -132,30 +133,6 @@
           }
         });
       },
-      protectText: function () {
-        const self = this;
-        let range = self.editor.find(/{{((?!}}).)+}}/, {
-          wrap: true,
-          regExp: true
-        });
-        const token = range && self.editor.session.getTextRange(range);
-        token && $.ajax({
-          type: 'POST',
-          async: false,
-          url: '/bin/apm/scripts/protect',
-          data: {
-            text: token.substring(token.indexOf('{{') + 2, token.indexOf('}}'))
-          }
-        }).done(function (data) {
-          setTimeout(function () {
-            range = self.editor.find(token, {
-              wrap: true
-            });
-            range && self.editor.session.replace(range, data.text);
-          }, 10);
-        });
-      },
-
       initEditor: function () {
         const self = this;
         let editor = null;
@@ -179,13 +156,8 @@
           });
         });
 
-        editor.session.on('change', function (delta) {
-          const value = editor.session.getValue();
-          if (value.indexOf('{{') > -1
-            && value.indexOf('{{') < value.lastIndexOf('}}')
-            && delta.data.action.startsWith('insert')) {
-            self.protectText();
-          }
+        editor.session.selection.on('changeSelection', function() {
+          self.$cryptoButton.attr('disabled', editor.getSelectedText().length === 0);
         });
 
         return editor;
@@ -237,6 +209,21 @@
           });
         });
 
+        this.$cryptoButton.click(function () {
+          let range = self.editor.getSelectionRange()
+          let text = self.editor.getSelectedText();
+          $.ajax({
+            type: 'POST',
+            async: false,
+            url: '/bin/apm/scripts/protect',
+            data: {
+              text: text
+            }
+          }).done(function (data) {
+            self.editor.session.replace(range, data.text);
+          });
+        });
+
         this.$saveButton.click(function () {
           self.fileUpload();
         });

diff --git a/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml b/app/aem/ui.apps.base/src/main/content/jcr_root/apps/apm/views/editor/.content.xml
@@ -43,6 +43,15 @@
           icon="spellcheck"
           text="Validate"
           variant="actionBar"/>
+        <crypto
+          granite:id="cryptoButton"
+          granite:class="foundation-collection-action"
+          jcr:primaryType="nt:unstructured"
+          sling:resourceType="granite/ui/components/coral/foundation/button"
+          disabled="true"
+          icon="lockOn"
+          text="Protect Text"
+          variant="actionBar"/>
       </primary>
       <secondary jcr:primaryType="nt:unstructured">
         <cancel