Copy tabs correctly even if there is any placeholder for content fiel…

…ds like `%DESCRIPTION%` #12
piroor · Jul 27, 2020 · df63426 · df63426 · DavidMcRitchie · Jul 27, 2020
1 parent c8793af
commit df63426
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/common/commands.js b/common/commands.js
@@ -176,11 +176,12 @@ export async function fillPlaceHolders(format, tab, indentLevel) {
       Permissions.isPermittedTab(tab) &&
       /%(AUTHOR|DESC(?:RIPTION)?|KEYWORDS)(?:_HTML(?:IFIED)?)?%/i.test(format)) {
     log('trying to get data from content ', tab.id);
-    params = await browser.tabs.executeScript(tab.id, {
+    let paramsFromContent = await browser.tabs.executeScript(tab.id, {
       file: '/common/get-content-text.js'
     });
-    if (Array.isArray(params))
-      params = params[0];
+    if (Array.isArray(paramsFromContent))
+      paramsFromContent = paramsFromContent[0];
+    params = { ...params, ...paramsFromContent };
     log('params ', params);
   }