DRYing out some of the util.js functionality

EFForg · Sep 17, 2018 · bcbfbed · bcbfbed
1 parent 50ec065
commit bcbfbed
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 36 deletions.
diff --git a/chromium/pages/cancel/index.html b/chromium/pages/cancel/index.html
@@ -12,7 +12,7 @@ <h1 id="https-everywhere"><img src="../../images/banner-red.png" alt="HTTPS Ever
     <p data-i18n="cancel_he_blocking_explainer"></p>
     <p id="url-paragraph"><span id="url-label">URL: </span><a href="#" id="originURL"></a></p>
     <script src="../translation.js"></script>
-    <script src="../send-message.js"></script>
+    <script src="../util.js"></script>
     <script src="ux.js"></script>
   </body>
 </html>
diff --git a/chromium/pages/debugging-rulesets/index.html b/chromium/pages/debugging-rulesets/index.html
@@ -19,7 +19,7 @@
     <textarea id="codemirror-textarea"></textarea>
     <button type="button" id="save-button">Save</button>
     <div id="saved-text">Saved!</div>
-    <script src="../send-message.js"></script>
+    <script src="../util.js"></script>
     <script src="ux.js"></script>
   </body>
 </html>
diff --git a/chromium/pages/devtools/index.html b/chromium/pages/devtools/index.html
@@ -3,7 +3,7 @@
   <head>
     <meta charset="utf-8">
     <title></title>
-    <script src="../send-message.js"></script>
+    <script src="../util.js"></script>
     <script src="ux.js"></script>
   </head>
   <body></body>

diff --git a/chromium/pages/options/index.html b/chromium/pages/options/index.html
@@ -52,7 +52,6 @@
 
     <script src="ux.js"></script>
     <script src="../translation.js"></script>
-    <script src="../send-message.js"></script>
     <script src="../util.js"></script>
   </body>
 </html>
diff --git a/chromium/pages/popup/index.html b/chromium/pages/popup/index.html
@@ -7,7 +7,7 @@
     <link href="style.css" rel="stylesheet">
     <script src="ux.js"></script>
     <script src="../translation.js"></script>
-    <script src="../send-message.js"></script>
+    <script src="../util.js"></script>
   </head>
   <body>
     <header>

diff --git a/chromium/pages/popup/ux.js b/chromium/pages/popup/ux.js
@@ -1,11 +1,12 @@
+/* global e */
+/* global hide */
+/* global show */
 /* global sendMessage */
+/* global getOption_ */
+/* global setOption_ */
 
 "use strict";
 
-function e(id) {
-  return document.getElementById(id);
-}
-
 /**
  * Handles rule (de)activation in the popup
  */
@@ -209,14 +210,6 @@ var escapeForRegex = function( value ) {
   return value.replace(/[\-\[\]{}()*+?.,\\\^$|#\s]/g, "\\$&");
 };
 
-function hide(elem) {
-  elem.style.display = "none";
-}
-
-function show(elem) {
-  elem.style.display = "block";
-}
-
 function showEnableOrDisable(url, disabled) {
   if (["http:", "https:", "ftp:"].indexOf(url.protocol) != -1) {
     const disableLink = e("disable-on-this-site");
@@ -311,18 +304,6 @@ function toggleHttpNowhere() {
   });
 }
 
-function getOption_(opt, defaultOpt, callback) {
-  var details = {};
-  details[opt] = defaultOpt;
-  sendMessage("get_option", details, callback);
-}
-
-function setOption_(opt, value, callback) {
-  var details = {};
-  details[opt] = value;
-  sendMessage("set_option", details, callback);
-}
-
 function getTab(callback) {
   let url = new URL(window.location.href);
   if (url.searchParams.has('tabId')) {

diff --git a/chromium/pages/send-message.js b/chromium/pages/send-message.js
diff --git a/chromium/pages/util.js b/chromium/pages/util.js
@@ -1,7 +1,9 @@
 /* exported e */
 /* exported hide */
 /* exported show */
+/* exported sendMessage */
 /* exported getOption_ */
+/* exported setOption_ */
 
 "use strict";
 
@@ -20,6 +22,10 @@ function show(elem) {
   elem.style.display = "block";
 }
 
+function sendMessage(type, object, callback) {
+  chrome.runtime.sendMessage({ type, object }, callback);
+}
+
 /**
 * Get an option from global settings
 * @param {string} opt
@@ -32,3 +38,9 @@ function getOption_(opt, defaultOpt, callback) {
   details[opt] = defaultOpt;
   sendMessage("get_option", details, callback);
 }
+
+function setOption_(opt, value, callback) {
+  var details = {};
+  details[opt] = value;
+  sendMessage("set_option", details, callback);
+}