refactor trustedCreateElement() a bit

AdguardTeam · Feb 12, 2024 · 1086e9a · 1086e9a
1 parent 15cee76
commit 1086e9a
Showing 1 changed file with 15 additions and 17 deletions.
diff --git a/src/scriptlets/trusted-create-element.ts b/src/scriptlets/trusted-create-element.ts
@@ -92,15 +92,6 @@ export function trustedCreateElement(
         logMessage(source, `${prefix} due to ${getErrorMessage(error)}`);
     };
 
-    let attributes: ParsedAttributePair[];
-
-    try {
-        attributes = parseAttributePairs(attributePairs);
-    } catch (e) {
-        logError(`Cannot parse attributePairs param: '${attributePairs}'`, e);
-        return;
-    }
-
     let element: HTMLElement;
     try {
         element = document.createElement(tagName);
@@ -110,16 +101,23 @@ export function trustedCreateElement(
         return;
     }
 
-    if (attributes) {
-        attributes.forEach((attr) => {
-            try {
-                element.setAttribute(attr.name, attr.value);
-            } catch (e) {
-                logError(`Cannot set attribute '${attr.name}' with value '${attr.value}'`, e);
-            }
-        });
+    let attributes: ParsedAttributePair[] = [];
+
+    try {
+        attributes = parseAttributePairs(attributePairs);
+    } catch (e) {
+        logError(`Cannot parse attributePairs param: '${attributePairs}'`, e);
+        return;
     }
 
+    attributes.forEach((attr) => {
+        try {
+            element.setAttribute(attr.name, attr.value);
+        } catch (e) {
+            logError(`Cannot set attribute '${attr.name}' with value '${attr.value}'`, e);
+        }
+    });
+
     let timerId: ReturnType<typeof setTimeout>;
 
     /**