Merge pull request #2 from kpeckett/remove-options-page

Removed license check & license check page
CatBlock · Oct 12, 2014 · f928112 · f928112
2 parents 2af426a + 158d454
commit f928112
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 206 deletions.
diff --git a/background.js b/background.js
@@ -49,7 +49,7 @@ storage_set = function(key, value) {
 if (!SAFARI) {
   // Open options on button click.
   chrome.browserAction.onClicked.addListener(function() {
-    var page = chrome.extension.getURL("options/index.html");
+    var page = chrome.extension.getURL("options/general.html");
     chrome.tabs.query({url:page}, function(results) {
       if (results.length > 0)
         chrome.tabs.update(results[0].id, {active:true, url:page});

diff --git a/license/check.js b/license/check.js
diff --git a/license/setup.html b/license/setup.html
diff --git a/license/setup1.js b/license/setup1.js
diff --git a/manifest.json b/manifest.json
@@ -11,12 +11,11 @@
     "scripts": [
       "port.js",
       "jquery.min.js",
-      "license/check.js",
       "channels.js",
       "background.js"
     ]
   },
-  "options_page": "options/index.html",
+  "options_page": "options/general.html",
   "minimum_chrome_version": "17",
   "incognito": "spanning",
   "browser_action": {

diff --git a/options/general.html b/options/general.html
@@ -51,7 +51,7 @@ <h1>CatBlock Options</h1>
       <br/>
     </div>
 
-    <script src="general1.js"></script>
+    <script src="general.js"></script>
 
     <!--
     <hr/>

diff --git a/options/general1.js → options/general.js b/options/general1.js → options/general.js
diff --git a/options/index.html b/options/index.html
diff --git a/options/index1.js b/options/index1.js
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,7 +51,7 @@ <h1>CatBlock Options</h1> @@
           <br/>
         </div>
-        <script src="general1.js"></script>
+        <script src="general.js"></script>
         <!--
         <hr/>
@@ Expand Down @@