added tag 'release-beta-2024-02-07-14.31/+0100' for beta version in f…

…older beta.
asterics · Feb 7, 2024 · ba43b80 · ba43b80
1 parent e803e34
commit ba43b80
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 10 deletions.
diff --git a/latest/app/build/asterics-grid.bundle.js b/latest/app/build/asterics-grid.bundle.js
diff --git a/latest/serviceWorker.js b/latest/serviceWorker.js
@@ -39,7 +39,7 @@ self.addEventListener('install', (event) => {
 self.addEventListener('activate', event => {
     clients.claim();
     sendToClients({type: constants.SW_EVENT_ACTIVATED, activated: true});
-    console.log('Service Worker active! Version: https://github.com/asterics/AsTeRICS-Grid/releases/tag/release-beta-2024-02-07-14.13/+0100');
+    console.log('Service Worker active! Version: https://github.com/asterics/AsTeRICS-Grid/releases/tag/release-beta-2024-02-07-14.31/+0100');
 });
 
 self.addEventListener('message', (event) => {

diff --git a/latest/src/js/service/collectElementService.js b/latest/src/js/service/collectElementService.js
@@ -277,6 +277,13 @@ function getActionOfType(elem, type) {
     return elem.actions[index];
 }
 
+function getActionsOfType(elem, type) {
+    if (!elem) {
+        return [];
+    }
+    return elem.actions.filter(action => action.modelName === type);
+}
+
 function getActionTypes(elem) {
     return elem.actions.map((action) => action.modelName);
 }
@@ -521,6 +528,14 @@ $(window).on(constants.ELEMENT_EVENT_ID, function (event, element) {
     if (getActionTypes(element).some((type) => ignoreActions.includes(type))) {
         return; // dont collect elements containing "ignoreActions"
     }
+    let navigateAction = getActionOfType(element, GridActionNavigate.getModelName());
+    if (navigateAction && getLabel(element).length !== 1 && !navigateAction.addToCollectElem) {
+        return; // no adding of text if the element contains an navigate action and it's no single keyboard character
+    }
+    let wordFormActions = getActionsOfType(element, GridActionWordForm.getModelName());
+    if (wordFormActions.length > 0 && wordFormActions.some(a => a.type === GridActionWordForm.WORDFORM_MODE_NEXT_FORM)) {
+        return; // no adding, since the action itself adds the element
+    }
     if (element.dontCollect) {
         return;
     }
@@ -532,14 +547,6 @@ $(window).on(constants.ELEMENT_EVENT_ID, function (event, element) {
             return;
         }
     }
-    let navigateAction = getActionOfType(element, GridActionNavigate.getModelName());
-    if (navigateAction && getLabel(element).length !== 1 && !navigateAction.addToCollectElem) {
-        return; // no adding of text if the element contains an navigate action and it's no single keyboard character
-    }
-    let wordFormAction = getActionOfType(element, GridActionWordForm.getModelName());
-    if (wordFormAction && wordFormAction.type === GridActionWordForm.WORDFORM_MODE_NEXT_FORM) {
-        return; // no adding, since the action itself adds the element
-    }
 
     if (element.type === GridElement.ELEMENT_TYPE_NORMAL) {
         element.wordFormTags = stateService.getCurrentWordFormTags();