Merge branch 'global-exclude-option-2843'

Fixes #2843

_locales/en/messages.json

@@ -66,6 +66,9 @@
   "enabled": {
     "message": "Enabled"
   },
+  "Exclude": {
+    "message": "Exclude"
+  },
   "extDesc": {
     "message": "A User Script manager for Firefox."
   },
@@ -78,6 +81,12 @@
   "get_user_scripts": {
     "message": "Get user scripts"
   },
+  "global_excludes": {
+    "message": "Global Excludes"
+  },
+  "global_excludes_explain": {
+    "message": "One @exclude pattern per line.  No user scripts will run here."
+  },
   "gm_notif_text_must_be_string": {
     "message": "GM.notification: \"text\" must be a string"
   },
@@ -109,6 +118,9 @@
   "greasemonkey_is_disabled": {
     "message": "Greasemonkey is disabled"
   },
+  "greasemonkey_options": {
+    "message": "Greasemonkey Options"
+  },
   "greasemonkey_user_script_editor": {
     "message": "Greasemonkey User Script Editor"
   },

doc/Messages.md

@@ -68,27 +68,27 @@ Data:
 * `value` The new value to store.
 
 # EnabledChanged
-Sent by: `bg/is-enabled.js`.
+Sent by: `bg/options.js`.
 
 Sent whenever the global enabled status changes.
 
 * `enabled` boolean, the new status (true = enabled, false = disabled).
 
 # EnabledQuery
-Received by: `bg/is-enabled.js`.
+Received by: `bg/options.js`.
 
 Send with no data, responds with a boolean: the new status
 (true = enabled, false = disabled).
 
 # EnabledSet
-Received by: `bg/is-enabled.js`.
+Received by: `bg/options.js`.
 
 Send this to set the global enabled status.
 
 * `enabled` boolean, the new status (true = enabled, false = disabled).
 
 # EnabledToggle
-Received by: `bg/is-enabled.js`.
+Received by: `bg/options.js`.
 
 Send this to toggle the global enabled status.  No data.
 
@@ -109,6 +109,22 @@ Response data:
 
 * An array of `.details` objects from installed `RunnableUserScript`s.
 
+# OptionsLoad
+Sent by: `browser/monkey-menu.js`
+Received by: `bg/options.js`
+
+Returns previously saved options data.  Result is the same format as `OptionsSave`'s request.
+
+* `excludes` A string, one `@exclude` pattern per line.
+
+# OptionsSave
+Sent by: `browser/monkey-menu.js`
+Received by: `bg/options.js`
+
+Passes the user's option values from content to background for persistence.  Request data:
+
+* `excludes` A string, one `@exclude` pattern per line.
+
 # UserScriptGet
 Sent by: `content/edit-user-script.js`
 

manifest.json

@@ -32,11 +32,11 @@
       "/src/bg/api-provider-source.js",
       "/src/bg/execute.js",
       "/src/bg/export-db.js",
-      "/src/bg/is-enabled.js",
       "/src/bg/on-message.js",
       "/src/bg/on-user-script-notification.js",
       "/src/bg/on-user-script-open-in-tab.js",
       "/src/bg/on-user-script-xhr.js",
+      "/src/bg/options.js",
       "/src/bg/user-script-detect.js",
       "/src/bg/user-script-registry.js",
       "/src/bg/value-store.js",

src/bg/is-enabled.js → src/bg/options.js

@@ -7,31 +7,45 @@ of Greasemonkey.
 // Private implementation.
 (function() {
 
-let isEnabled = true;
+let gIsEnabled = true;
 chrome.storage.local.get('globalEnabled', v => {
-  isEnabled = v['globalEnabled'];
-  if ('undefined' == typeof isEnabled) isEnabled = true;
+  gIsEnabled = v['globalEnabled'];
+  if ('undefined' == typeof gIsEnabled) gIsEnabled = true;
   setIcon();
 });
 
+let gGlobalExcludes = [];
+chrome.storage.local.get('globalExcludes', v => {
+  let str = v['globalExcludes'];
+  if ('undefined' != typeof str) {
+    gGlobalExcludes = str.split('\n');
+  }
+});
+
 
 function getGlobalEnabled() {
-  return !!isEnabled;
+  return !!gIsEnabled;
 }
 window.getGlobalEnabled = getGlobalEnabled;
 
 
+function getGlobalExcludes() {
+  return gGlobalExcludes.slice();
+}
+window.getGlobalExcludes = getGlobalExcludes;
+
+
 function onEnabledQuery(message, sender, sendResponse) {
-  sendResponse(isEnabled);
+  sendResponse(gIsEnabled);
 }
 window.onEnabledQuery = onEnabledQuery;
 
 
 function setGlobalEnabled(enabled) {
-  isEnabled = !!enabled;
+  gIsEnabled = !!enabled;
   chrome.runtime.sendMessage({
     'name': 'EnabledChanged',
-    'enabled': isEnabled,
+    'enabled': gIsEnabled,
   }, logUnhandledError);
   setIcon();
   chrome.storage.local.set({'globalEnabled': enabled});
@@ -50,7 +64,7 @@ function setIcon() {
     return;
   }
   let iconPath = chrome.extension.getURL('skin/icon.svg');
-  if (isEnabled) {
+  if (gIsEnabled) {
     chrome.browserAction.setIcon({'path': iconPath});
   } else {
     let img = document.createElement('img');
@@ -69,17 +83,34 @@ function setIcon() {
 
 
 function toggleGlobalEnabled() {
-  setGlobalEnabled(!isEnabled);
+  setGlobalEnabled(!gIsEnabled);
 }
 window.toggleGlobalEnabled = toggleGlobalEnabled;
 
+/*****************************************************************************/
 
 function onEnabledToggle(message, sender, sendResponse) {
-  try {
-    toggleGlobalEnabled();
-    sendResponse(isEnabled);
-  } catch (e) { console.error(e); }
+  toggleGlobalEnabled();
+  sendResponse(gIsEnabled);
 }
 window.onEnabledToggle = onEnabledToggle;
 
+
+function onOptionsLoad(message, sender, sendResponse) {
+  let options = {
+    'excludes': gGlobalExcludes.join('\n'),
+  };
+  sendResponse(options);
+}
+window.onOptionsLoad = onOptionsLoad;
+
+
+function onOptionsSave(message, sender, sendResponse) {
+  chrome.storage.local.set(
+      {'globalExcludes': message.excludes},
+      logUnhandledError);
+  gGlobalExcludes = message.excludes.split('\n');
+}
+window.onOptionsSave = onOptionsSave;
+
 })();

src/browser/monkey-menu.css

@@ -17,7 +17,7 @@ body#rendering { display: none; }
 
 
 #script-list-scroll {
-  max-height: 380px;
+  max-height: 347px;
   overflow-y: auto;
 }
 
@@ -34,13 +34,50 @@ section {
   width: 100vw;
 }
 
-section.user-script {
+/* Hide non-main sections by default. */
+section.options,
+section.user-script
+{
   position: absolute;
   top: 0;
   left: 100vw;
 }
 
-body#user-script section { margin-left: -100vw; }
+/* Slide the main menu away when it's non-active. */
+section.main-menu
+{ margin-left: -100vw; }
+body#main-menu section.main-menu
+{ margin-left: 0; }
+
+/* Slide the other menu in when it's active. */
+body#options section.options,
+body#user-script section.user-script
+{ margin-left: -100vw; }
+
+
+section header {
+  color: -moz-fieldText;
+  overflow-x: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+
+section menuitem.go-back {
+  box-sizing: content-box;
+  color: inherit;
+  display: inline-block;
+  height: 16px;
+  margin: 4px 4px 0 4px;
+  padding: 8px;
+  vertical-align: -10px;  /* Relative to text, after padding. */
+  width: 16px;
+}
+section menuitem.go-back:hover {
+  background-color: var(--focus-color);
+}
+section menuitem.go-back::before {
+  content: url(/skin/back.svg);
+}
 
 /********************************** MENUS ************************************/
 
@@ -99,32 +136,6 @@ menu heading {
 
 /***************************** SCRIPT DETAIL *********************************/
 
-menuitem#back {
-  box-sizing: content-box;
-  color: inherit;
-  display: inline-block;
-  height: 16px;
-  margin: 4px 4px 0 4px;
-  padding: 8px;
-  vertical-align: -10px;  /* Relative to text, after padding. */
-  width: 16px;
-}
-menuitem#back:hover {
-  background-color: var(--focus-color);
-}
-menuitem#back::before {
-  content: url(/skin/back.svg);
-}
-
-
-section header {
-  color: -moz-fieldText;
-  overflow-x: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-
 section.user-script p {
   margin: 0;
   padding: 4px 12px 4px 10px;
@@ -140,3 +151,32 @@ section.user-script {
 section.user-script menu {
   overflow-y: auto;
 }
+
+/******************************** OPTIONS ************************************/
+
+section.options p {
+  margin: 0;
+  padding: 4px 12px 4px 10px;
+}
+
+section.options .explain a {
+  color: black;
+  float: right;
+}
+
+section.options textarea {
+  font-family: monospace;
+  font-size: 90%;
+  white-space: pre;
+}
+
+section.options #add-exclude-current {
+  cursor: pointer;
+  display: block;
+  margin-top: 4px;
+  padding: 0;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  width: 90vw;
+}