Merge branch 'main' into window-manipulator-update-for-issue-28

mdn · Oct 4, 2023 · 5f2fe84 · 5f2fe84
2 parents 9dd4add + 709bc28
commit 5f2fe84
Show file tree

Hide file tree

Showing 30 changed files with 12 additions and 26 deletions.
diff --git a/build/README.md b/build/README.md
diff --git a/build/apply_css-1.0-an+fx.xpi b/build/apply_css-1.0-an+fx.xpi
diff --git a/build/beastify-1.0-an+fx.xpi b/build/beastify-1.0-an+fx.xpi
diff --git a/build/bookmark_it-1.0-an+fx.xpi b/build/bookmark_it-1.0-an+fx.xpi
diff --git a/build/borderify-1.0-an+fx.xpi b/build/borderify-1.0-an+fx.xpi
diff --git a/build/chillout_page_action-1.0-an+fx.xpi b/build/chillout_page_action-1.0-an+fx.xpi
diff --git a/build/context_menu_demo-1.0-an+fx.xpi b/build/context_menu_demo-1.0-an+fx.xpi
diff --git a/build/cookie_bg_picker-1.0-an+fx.xpi b/build/cookie_bg_picker-1.0-an+fx.xpi
diff --git a/build/emoji_substitution-1.0-an+fx.xpi b/build/emoji_substitution-1.0-an+fx.xpi
diff --git a/build/eslint_example-1.0-an+fx.xpi b/build/eslint_example-1.0-an+fx.xpi
diff --git a/build/favourite_colour-1.0-an+fx.xpi b/build/favourite_colour-1.0-an+fx.xpi
diff --git a/build/favourite_colour-1.1-an+fx.xpi b/build/favourite_colour-1.1-an+fx.xpi
diff --git a/build/history_deleter-1.0-an+fx.xpi b/build/history_deleter-1.0-an+fx.xpi
diff --git a/build/latest_download-1.0-an+fx.xpi b/build/latest_download-1.0-an+fx.xpi
diff --git a/build/list_cookies-1.0-an+fx.xpi b/build/list_cookies-1.0-an+fx.xpi
diff --git a/build/navigation_stats-0.1.0-an+fx.xpi b/build/navigation_stats-0.1.0-an+fx.xpi
diff --git a/build/notify_link_clicks_i18n-1.0-an+fx.xpi b/build/notify_link_clicks_i18n-1.0-an+fx.xpi
diff --git a/build/open_my_page-1.0-an+fx.xpi b/build/open_my_page-1.0-an+fx.xpi
diff --git a/build/page_to_extension_messaging-1.0-an+fx.xpi b/build/page_to_extension_messaging-1.0-an+fx.xpi
diff --git a/build/page_to_extension_messaging-1.0-fx.xpi b/build/page_to_extension_messaging-1.0-fx.xpi
diff --git a/build/quicknote-1.0-an+fx.xpi b/build/quicknote-1.0-an+fx.xpi
diff --git a/build/sample_commands_extension-1.0-an+fx.xpi b/build/sample_commands_extension-1.0-an+fx.xpi
diff --git a/build/sample_commands_extension-1.0-fx.xpi b/build/sample_commands_extension-1.0-fx.xpi
diff --git a/build/selection_to_clipboard-1.0-an+fx.xpi b/build/selection_to_clipboard-1.0-an+fx.xpi
diff --git a/build/tab_strip-1.0-an+fx.xpi b/build/tab_strip-1.0-an+fx.xpi
diff --git a/build/tabs_tabs_tabs-1.0-an+fx.xpi b/build/tabs_tabs_tabs-1.0-an+fx.xpi
diff --git a/build/user_agent_rewriter-1.0-an+fx.xpi b/build/user_agent_rewriter-1.0-an+fx.xpi
diff --git a/build/window_manipulator-1.0-an+fx.xpi b/build/window_manipulator-1.0-an+fx.xpi
diff --git a/favourite-colour/options.js b/favourite-colour/options.js
@@ -1,20 +1,16 @@
-function saveOptions(e) {
-  browser.storage.sync.set({
+async function saveOptions(e) {
+  e.preventDefault();
+  await browser.storage.sync.set({
     colour: document.querySelector("#colour").value
   });
-  e.preventDefault();
 }
 
-function restoreOptions() {
-  let storageItem = browser.storage.managed.get('colour');
-  storageItem.then((res) => {
-    document.querySelector("#managed-colour").innerText = res.colour;
-  });
+async function restoreOptions() {
+  let res = await browser.storage.managed.get('colour');
+  document.querySelector("#managed-colour").innerText = res.colour;
 
-  let gettingItem = browser.storage.sync.get('colour');
-  gettingItem.then((res) => {
-    document.querySelector("#colour").value = res.colour || 'Firefox red';
-  });
+  res = await browser.storage.sync.get('colour');
+  document.querySelector("#colour").value = res.colour || 'Firefox red';
 }
 
 document.addEventListener('DOMContentLoaded', restoreOptions);

diff --git a/root-cert-stats/background.js b/root-cert-stats/background.js
@@ -1,6 +1,9 @@
 "use strict";
 
-let rootCertStats = {};
+// Note: declared with "var" because popup.js references this global variable.
+// If this were to be declared with "const" or "let", then the variable would
+// still be available to this file, but not to popup.js.
+var rootCertStats = {};
 
 /*
 On an onHeadersReceived event, if there was a successful TLS connection