Add Firefox support

Signed-off-by: Alan D. Tse <alandtse@gmail.com>
spdx · Aug 14, 2018 · 405e620 · 405e620
1 parent ed0c0c6
commit 405e620
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 54 deletions.
diff --git a/app/manifest.json b/app/manifest.json
@@ -23,6 +23,5 @@
     "open_in_tab": false
   },
   "web_accessible_resources": [ "license-list/*"],
-  "permissions": ["storage", "unlimitedStorage", "activeTab"],
-  "content_security_policy": "script-src 'self' https://spdx.org; object-src 'self'"
+  "permissions": ["storage", "unlimitedStorage", "activeTab", "*://spdx.org/*"]
 }
diff --git a/app/scripts/background.js b/app/scripts/background.js
@@ -1,5 +1,5 @@
 // Enable chromereload by uncommenting this line:
-if(process.env.NODE_ENV === 'development'){
+if(process.env.NODE_ENV === 'development' && typeof browser === "undefined"){
   require('chromereload/devonly')
 }
 
@@ -27,88 +27,86 @@ chrome.browserAction.setBadgeText({
   text: `Diff`
 })
 
-chrome.browserAction.onClicked.addListener(function(tab) {
-  // Send a message to the active tab
 
+function handleClick(tab) {
+  // Send a message to the active tab
   chrome.tabs.query({active: true, currentWindow: true}, function(tab) {
     var activeTab = tab[0];
     activeTabId = activeTab.id
     if (! status[activeTabId]){
-      chrome.tabs.insertCSS(activeTabId, {file:"styles/contentscript.css"});
-      chrome.tabs.executeScript(activeTabId,{file: "scripts/contentscript.js"},
+      chrome.tabs.insertCSS(activeTabId, {file:"/styles/contentscript.css"});
+      chrome.tabs.executeScript(activeTabId,{file: "/scripts/contentscript.js"},
         function(result){
           chrome.tabs.sendMessage(activeTabId, {"command": "clicked_browser_action"});
           });
     }else{
     chrome.tabs.sendMessage(activeTabId, {"command": "clicked_browser_action"});
     }
   });
-});
-
-chrome.runtime.onStartup.addListener(restore_options());
+}
 
-chrome.tabs.onActivated.addListener(function(activeinfo) {
+function handleActivate(activeinfo) {
   // Set the active tab
   activeTabId = activeinfo.tabId;
   //console.log("ActiveTabId changed", activeTabId)
-});
-chrome.windows.onFocusChanged.addListener(function(windowid) {
+}
+
+function handleFocusChanged(windowid) {
   // Set the active tab
   chrome.tabs.query({active: true, currentWindow: true}, function(queryinfo) {
     if (queryinfo.length > 0)
       activeTabId = queryinfo[0].id;
     //console.log("ActiveTabId changed", activeTabId)
   });
-});
+}
 
 //This function responds to changes to storage
-chrome.storage.onChanged.addListener(function(changes, area) {
+function handleStorageChange(changes, area) {
     if (area == "local" && "options" in changes) {
       console.log("Detected changed options; reloading")
       restore_options();
     }
-});
+}
 
 //respond to content script
-chrome.runtime.onMessage.addListener(
-  function(request, sender, sendResponse) {
-    switch (request.command) {
-      case "focused":
-      activeTabId = sender.tab.id;
-      console.log ("activeTabId", activeTabId)
-      break;
-      case "updatelicenselist":
-      updateList()
-      break;
-      case "compareselection":
-      selection = request.selection
-      activeTabId = sender.tab.id
-      if (updating){
-        pendingcompare = true
-        comparequeue.push({'selection':selection,'tabId':activeTabId});
-        console.log("Update pending; queing compare for tab %s; %s queued", activeTabId, comparequeue.length);
-        status[activeTabId] = "Pending"
-        break;
-      }
-      console.log("tab %s: Starting compare: %s", activeTabId, selection.substring(0,25));
-      status[activeTabId] = "Comparing"
-      compareSelection(selection, activeTabId)
-      break;
-      case "generateDiff":
-      activeTabId = sender.tab.id
-      request["tabId"] = activeTabId;
-      console.log("tab %s: Generating diff:", activeTabId, request);
-      status[activeTabId] = "Diffing"
-      diffcount[activeTabId] = diffcount[activeTabId] + 1
-      dowork(request);
-      break;
-      default:
-      // console.log("Proxying to worker", request);
-      // chrome.tabs.sendMessage(activeTab.id, request);
+function handleMessage(request, sender, sendResponse) {
+  switch (request.command) {
+    case "focused":
+    activeTabId = sender.tab.id;
+    console.log ("activeTabId", activeTabId)
+    break;
+    case "updatelicenselist":
+    updateList()
+    break;
+    case "compareselection":
+    selection = request.selection
+    activeTabId = sender.tab.id
+    if (updating){
+      pendingcompare = true
+      comparequeue.push({'selection':selection,'tabId':activeTabId});
+      console.log("Update pending; queing compare for tab %s; %s queued", activeTabId, comparequeue.length);
+      status[activeTabId] = "Pending"
       break;
     }
+    console.log("tab %s: Starting compare: %s", activeTabId, selection.substring(0,25));
+    status[activeTabId] = "Comparing"
+    compareSelection(selection, activeTabId)
+    break;
+    case "generateDiff":
+    activeTabId = sender.tab.id
+    request["tabId"] = activeTabId;
+    console.log("tab %s: Generating diff:", activeTabId, request);
+    status[activeTabId] = "Diffing"
+    diffcount[activeTabId] = diffcount[activeTabId] + 1
+    dowork(request);
+    break;
+    default:
+    // console.log("Proxying to worker", request);
+    // chrome.tabs.sendMessage(activeTab.id, request);
+    break;
   }
-);
+}
+
 // Workerqueue functions
 // These functions are for allowing multiple workers.
 function workeronmessage(event) {
@@ -436,3 +434,16 @@ function workerdone(id){
   workers[id][1] = false
   runningworkers--
 }
+
+function init() {
+  console.log("Initializing spdx-diff")
+  chrome.runtime.onMessage.addListener(handleMessage);
+  chrome.browserAction.onClicked.addListener(handleClick);
+  chrome.tabs.onActivated.addListener(handleActivate);
+  chrome.windows.onFocusChanged.addListener(handleFocusChanged);
+  chrome.storage.onChanged.addListener(handleStorageChange);
+  restore_options();
+}
+
+chrome.runtime.onStartup.addListener(init);
+init();
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
@@ -1,6 +1,6 @@
 "use strict";
 // Enable chromereload by uncommenting this line:
-if(process.env.NODE_ENV === 'development'){
+if(process.env.NODE_ENV === 'development' && typeof browser === "undefined"){
   require('chromereload/devonly')
 }
 
@@ -96,6 +96,7 @@ chrome.runtime.onMessage.addListener(
     break;
     default:
     break;
+    return true;
   }
 });
 
@@ -290,3 +291,6 @@ function restore_options() {
     }
   });
 }
+
+console.log("Spdx-diff ContentScript loaded")
+true;
diff --git a/app/scripts/options.js b/app/scripts/options.js
@@ -1,6 +1,6 @@
 "use strict";
 // Enable chromereload by uncommenting this line:
-if(process.env.NODE_ENV === 'development'){
+if(process.env.NODE_ENV === 'development' && typeof browser === "undefined"){
   require('chromereload/devonly')
 }