Merge 3 features

package.json

@@ -1,6 +1,7 @@
 {
   "private": true,
   "devDependencies": {
+    "@types/chrome": "0.0.59",
     "grunt": "^0.4.5",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-zip": "^0.16.2",

src/background.js

@@ -1,4 +1,5 @@
-defaultOptions = { "button":    2,
+// @ts-check
+var defaultOptions = { "button":    2,
                    "key_shift": false,
                    "key_ctrl":  false,
                    "key_alt":   false,
@@ -8,9 +9,15 @@ defaultOptions = { "button":    2,
                    "friction":  10,
                    "cursor":    true,
                    "notext":    false,
+                   "nolinks":   false,
+                   "nobuttons": false,
+                   "nolabels":  false,
+                   "noimages":  false,
+                   "noembeds":  false,
                    "grab_and_drag": false,
                    "debug":     false,
                    "blacklist": "",
+                   "browser_enabled": true,
                  }
 
 for (var k in defaultOptions)
@@ -24,9 +31,9 @@ function loadOptions() {
   return o
 }
 
-clients = {}
+var clients = {}
 
-chrome.extension.onConnect.addListener(function(port) {
+chrome.runtime.onConnect.addListener(function(port) {
   port.postMessage({ saveOptions: localStorage })
   var id = port.sender.tab.id + ":" + port.sender.frameId
   console.log("connect: "+id)
@@ -47,6 +54,51 @@ function saveOptions(o) {
   }
 }
 
+chrome.browserAction.onClicked.addListener(function(tab) {
+  if (localStorage['browser_enabled'] == "true") {
+    localStorage['browser_enabled'] = "false"
+    chrome.browserAction.setIcon({path:"icon16dis.png"})
+  }
+  else {
+    localStorage['browser_enabled'] = "true"
+    chrome.browserAction.setIcon({path:"icon16.png"})
+  }
+  saveOptions({o:'browser_enabled'})
+})
+
+// This does not require "permissions":["tabs"] becuase it only acts on its
+// current tab.
+chrome.contextMenus.create({
+  title:"Add site to SA blacklist",
+  contexts:["all"],
+  type:"normal",
+  onclick: (info, tab) => {
+    // 'document.location.hostname' here is a string containing our app ID.
+    // info.pageUrl and tab.url are both the full URL of this page, we only
+    // want the hostname, so use a dummy object (instead of requiring another
+    // library to parse the URL)
+    let dummy = document.createElement('a')
+    dummy.href = tab.url
+
+    // Use dummy.hostname for now; If @davidparsson agrees on issue #68, then
+    // this should change to use dummy.host as well.
+    let blacklist = localStorage["blacklist"].split('\n')
+
+    for (var i = blacklist.length - 1; i >= 0; i--) {
+      var blacklistEntry = blacklist[i].trim();
+      if (dummy.hostname === blacklistEntry) {
+        // no need to check subdomains when adding to list
+        console.log(dummy.hostname,'already in blacklist')
+        return
+      }
+    }
+    console.log('pushing',dummy.hostname,'to blacklist')
+    blacklist.push(dummy.hostname)
+    localStorage['blacklist'] = blacklist.join('\n')
+    saveOptions({o:'blacklist'})
+  }
+})
+
 // Inject content script into all existing tabs (doesn't work)
 // This functionality requires
 //  "permissions": ["tabs"]

src/content.js

@@ -1,5 +1,6 @@
 
-ScrollbarAnywhere = (function() {
+//@ts-check
+var ScrollbarAnywhere = (function() {
 
   // === Options ===
 
@@ -11,9 +12,15 @@ ScrollbarAnywhere = (function() {
       options = msg.saveOptions
       options.cursor = (options.cursor == "true")
       options.notext = (options.notext == "true")
+      options.nolinks = (options.nolinks == "true")
+      options.nobuttons = (options.nobuttons == "true")
+      options.nolabels = (options.nolabels == "true")
+      options.noimages = (options.noimages == "true")
+      options.noembeds = (options.noembeds == "true")
       options.grab_and_drag = (options.grab_and_drag == "true")
       options.debug = (options.debug == "true")
       options.enabled = isEnabled(options.blacklist)
+      options.browser_enabled = (options.browser_enabled == "true")
       debug("saveOptions: ",options)
     }
   })
@@ -81,7 +88,6 @@ ScrollbarAnywhere = (function() {
   function vmag(v)     { return Math.sqrt(v[0]*v[0] + v[1]*v[1]) }
   function vunit(v)    { return vdiv(vmag(v),v) }
 
-
   // Test if the given point is directly over text
   var isOverText = (function() {
     var bonet = document.createElement("SPAN")
@@ -175,23 +181,26 @@ ScrollbarAnywhere = (function() {
     }
   }
 
-  // Don't drag when left-clicking on these elements
-  const LBUTTON_OVERRIDE_TAGS = ['A','INPUT','SELECT','TEXTAREA','BUTTON','LABEL','OBJECT','EMBED']
-  const MBUTTON_OVERRIDE_TAGS = ['A']
-  const RBUTTON_OVERRIDE_TAGS = ['A','INPUT','TEXTAREA','OBJECT','EMBED']
-  function hasOverrideAncestor(e) {
+  // Don't drag when clicking on these elements
+  const MANDATORY_OVERRIDE_TAGS = ['INPUT', 'TEXTAREA', 'SELECT']
+  function hasMandatoryOverrideAncestor(e) {
     if (e == null) return false
-    if (options.button == LBUTTON && shouldOverrideLeftButton(e)) return true;
-    if (options.button == MBUTTON && MBUTTON_OVERRIDE_TAGS.some(function(tag) { return tag == e.tagName })) return true
-    if (options.button == RBUTTON && RBUTTON_OVERRIDE_TAGS.some(function(tag) { return tag == e.tagName })) return true
+    if (MANDATORY_OVERRIDE_TAGS.some(function(tag) { return tag == e.tagName })) return true
     return arguments.callee(e.parentNode)
   }
 
-  function shouldOverrideLeftButton(e) {
-    return LBUTTON_OVERRIDE_TAGS.some(function(tag) { return tag == e.tagName; }) || hasRoleButtonAttribute(e);
+  function hasOptionalOverrideAncestor(e) {
+    if (e == null) return false
+    if (options.nolinks && e.tagName == 'A') return true
+    if (options.nobuttons && (e.tagName == 'BUTTON' || hasRoleButtonAttribute(e))) return true
+    if (options.nolabels && e.tagName == 'LABEL') return true
+    if (options.noimages && e.tagName == 'IMG') return true
+    if (options.noembeds && (e.tagName == 'OBJECT' || e.tagName == 'EMBED')) return true
+    return arguments.callee(e.parentNode)
   }
 
   function hasRoleButtonAttribute(e) {
+    // FIXME: github has a lot of links that look like buttons...
     if (e.attributes && e.attributes.role) {
       return e.attributes.role.value === 'button';
     }
@@ -248,16 +257,16 @@ ScrollbarAnywhere = (function() {
     var scrollFixElement = null;
 
     function createScrollFix() {
-      scrollFixElement = document.createElement('div');
-      scrollFixElement.setAttribute('style', 'background: transparent none !important');
-      scrollFixElement.style.position = 'fixed';
-      scrollFixElement.style.top=0;
-      scrollFixElement.style.right=0;
-      scrollFixElement.style.bottom=0;
-      scrollFixElement.style.left=0;
-      scrollFixElement.style.zIndex=99999999;
-      scrollFixElement.style.display='block';
-      //scrollFixElement.style.borderRight='5px solid rgba(0,0,0,0.04)';
+      scrollFixElement = document.createElement("div");
+      scrollFixElement.setAttribute("style", "background: transparent none !important");
+      scrollFixElement.style.position = "fixed";
+      scrollFixElement.style.top = "0";
+      scrollFixElement.style.right = "0";
+      scrollFixElement.style.bottom = "0";
+      scrollFixElement.style.left = "0";
+      scrollFixElement.style.zIndex = "99999999";
+      scrollFixElement.style.display = "block";
+      //scrollFixElement.style.borderRight="5px solid rgba(0,0,0,0.04)";
     }
 
     function show() {
@@ -421,7 +430,7 @@ ScrollbarAnywhere = (function() {
   })()
 
 
-  Scroll = (function() {
+  var Scroll = (function() {
     var scrolling = false
     var element
     var scrollOrigin
@@ -577,10 +586,15 @@ ScrollbarAnywhere = (function() {
       return true;
     }
 
+    if (!options.browser_enabled) {
+      debug("browserAction is disabled, ignoring")
+      return true;
+    }
+
     switch (activity) {
 
     case GLIDE:
-      stopGlide(ev)
+      stopGlide()
       // fall through
 
     case STOP:
@@ -599,11 +613,21 @@ ScrollbarAnywhere = (function() {
         break
       }
 
-      if (hasOverrideAncestor(ev.target)) {
+      if (hasMandatoryOverrideAncestor(ev.target)) {
         debug("forbidden target element, ignoring",ev)
         break
       }
 
+      if (hasOptionalOverrideAncestor(ev.target)) {
+        debug("optional target element disabled, ignoring",ev)
+        break
+      }
+
+      if (options.notext && isOverText(ev)) {
+        debug("detected text node, ignoring")
+        break
+      }
+
       if (isOverScrollbar(ev)) {
         debug("detected scrollbar click, ignoring",ev)
         break
@@ -615,11 +639,6 @@ ScrollbarAnywhere = (function() {
         break
       }
 
-      if (options.notext && isOverText(ev)) {
-        debug("detected text node, ignoring")
-        break
-      }
-
       debug("click MouseEvent=",ev," dragElement=",dragElement)
       activity = CLICK
       mouseOrigin = [ev.clientX,ev.clientY]
@@ -686,7 +705,7 @@ ScrollbarAnywhere = (function() {
       Clipboard.unblockPaste()
       ScrollFix.hide()
       if (ev.button == 0) getSelection().removeAllRanges()
-      if (document.activeElement) document.activeElement.blur()
+      if (document.activeElement) document.activeElement.blur() // FIXME: a) is this ever running? b) is it working when it does run?
       if (ev.target) ev.target.focus()
       if (ev.button == options.button) activity = STOP
       break
@@ -699,7 +718,7 @@ ScrollbarAnywhere = (function() {
       break
 
     case GLIDE:
-      stopGlide(ev)
+      stopGlide()
       break
 
     default:

src/manifest.json

@@ -23,6 +23,13 @@
   "background": {
     "scripts": ["background.js"]
   },
+  "browser_action": {
+    "default_title": "Click to toggle Scrollbar Anywhere"
+  },
+
+  "permissions": [
+    "contextMenus"
+  ],
   "options_page": "options.html",
   "manifest_version": 2,
   "minimum_chrome_version": "49"