Make the failSilently directive work per-element

duckduckgo · Jan 31, 2025 · b3ba0fa · b3ba0fa
1 parent 125c9af
commit b3ba0fa
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...gration-test/test-pages/broker-protection/actions/click-disabled-button-failSilently.json b/...gration-test/test-pages/broker-protection/actions/click-disabled-button-failSilently.json
@@ -3,11 +3,11 @@
       "action": {
         "actionType": "click",
         "id": "1",
-        "failSilently": true,
         "elements": [
           {
             "type": "button",
-            "selector": ".btn"
+            "selector": ".btn",
+            "failSilently": true
           }
         ]
       }

diff --git a/...on-test/test-pages/broker-protection/actions/click-nonexistent-selector-failSilently.json b/...on-test/test-pages/broker-protection/actions/click-nonexistent-selector-failSilently.json
@@ -3,11 +3,11 @@
       "action": {
         "actionType": "click",
         "id": "1",
-        "failSilently": true,
         "elements": [
           {
             "type": "button",
-            "selector": ".test"
+            "selector": ".test",
+            "failSilently": true
           }
         ]
       }

diff --git a/injected/src/features/broker-protection/actions/click.js b/injected/src/features/broker-protection/actions/click.js
@@ -51,7 +51,7 @@ export function click(action, userData, root = document) {
         const elements = getElements(rootElement, element.selector);
 
         if (!elements?.length) {
-            if (action.failSilently) {
+            if (element.failSilently) {
                 return new SuccessResponse({ actionID: action.id, actionType: action.actionType, response: null });
             }
 
@@ -67,7 +67,7 @@ export function click(action, userData, root = document) {
             const elem = elements[i];
 
             if ('disabled' in elem) {
-                if (elem.disabled && !action.failSilently) {
+                if (elem.disabled && !element.failSilently) {
                     return new ErrorResponse({ actionID: action.id, message: `could not click disabled element ${element.selector}'!` });
                 }
             }