Move .js files to /js and /lib folders (#47)

Signed-off-by: Tomáš Taro <tomas@getadblock.com>
CatBlock · May 22, 2016 · 7a6d29d · 7a6d29d
1 parent 8f42694
commit 7a6d29d
Show file tree

Hide file tree

Showing 31 changed files with 77 additions and 237 deletions.
diff --git a/Info.plist b/Info.plist
@@ -44,7 +44,7 @@
         <dict>
             <key>End</key>
             <array>
-                <string>punycode.min.js</string>
+                <string>lib/punycode.min.js</string>
                 <string>uiscripts/load_jquery_ui.js</string>
                 <string>uiscripts/blacklisting/rightclick_hook.js</string>
                 <string>uiscripts/blacklisting/overlay.js</string>
@@ -58,13 +58,13 @@
             </array>
             <key>Start</key>
             <array>
-                <string>jquery/jquery.min.js</string>
-                <string>port.js</string>
-                <string>functions.js</string>
+                <string>lib/jquery.min.js</string>
+                <string>js/port.js</string>
+                <string>js/functions.js</string>
                 <string>filtering/filteroptions.js</string>
-                <string>bandaids.js</string>
-                <string>adblock_start_common.js</string>
-                <string>adblock_start_safari.js</string>
+                <string>js/bandaids.js</string>
+                <string>js/adblock_start_common.js</string>
+                <string>js/adblock_start_safari.js</string>
                 <string>catblock/contentscript.js</string>
             </array>
         </dict>

diff --git a/background.html b/background.html
@@ -1,19 +1,19 @@
 <!DOCTYPE html>
 <html lang="en">
     <head>
-        <script type="text/javascript" src="punycode.min.js"></script>
-        <script type="text/javascript" src="jquery/jquery.min.js"></script>
-        <script type="text/javascript" src="port.js"></script>
-        <script type="text/javascript" src="functions.js"></script>
+        <script type="text/javascript" src="lib/punycode.min.js"></script>
+        <script type="text/javascript" src="lib/jquery.min.js"></script>
+        <script type="text/javascript" src="js/port.js"></script>
+        <script type="text/javascript" src="js/functions.js"></script>
         <script type="text/javascript" src="filtering/domainset.js"></script>
         <script type="text/javascript" src="filtering/filteroptions.js"></script>
         <script type="text/javascript" src="filtering/filtertypes.js"></script>
         <script type="text/javascript" src="filtering/filterset.js"></script>
         <script type="text/javascript" src="filtering/myfilters.js"></script>
         <script type="text/javascript" src="filtering/filternormalizer.js"></script>
-        <script type="text/javascript" src="idlehandler.js"></script>
+        <script type="text/javascript" src="js/idlehandler.js"></script>
         <script type="text/javascript" src="catblock/channels.js"></script>
-        <script type="text/javascript" src="edge-updates.js"></script>
-        <script type="text/javascript" src="background.js"></script>
+        <script type="text/javascript" src="js/edge-updates.js"></script>
+        <script type="text/javascript" src="js/background.js"></script>
     </head>
 </html>
diff --git a/background_safari.html b/background_safari.html
@@ -1,20 +1,20 @@
 <html>
   <head>
-    <script src="punycode.min.js"></script>
-    <script src="jquery/jquery.min.js"></script>
-    <script src="port.js"></script>
-    <script src="functions.js"></script>
+    <script src="lib/punycode.min.js"></script>
+    <script src="lib/jquery.min.js"></script>
+    <script src="js/port.js"></script>
+    <script src="js/functions.js"></script>
     <script src="filtering/domainset.js"></script>
     <script src="filtering/filteroptions.js"></script>
     <script src="filtering/filtertypes.js"></script>
     <script src="filtering/filterset.js"></script>
     <script src="filtering/declarativewebrequest.js"></script>
     <script src="filtering/myfilters.js"></script>
     <script src="filtering/filternormalizer.js"></script>
-    <script src="idlehandler.js"></script>
+    <script src="js/idlehandler.js"></script>
     <script src="catblock/channels.js"></script>
-    <script src="background.js"></script>
-    <script src="safari_bg.js"></script>
+    <script src="js/background.js"></script>
+    <script src="js/safari_bg.js"></script>
   </head>
   <body>
   </body>

diff --git a/button/popup.html b/button/popup.html
@@ -2,10 +2,10 @@
 <html>
   <head>
     <link rel="stylesheet" href="popup.css"/>
-    <script src="../punycode.min.js"></script>
-    <script src="../port.js"></script>
-    <script src="../jquery/jquery.min.js"></script>
-    <script src="../functions.js"></script>
+    <script src="../lib/punycode.min.js"></script>
+    <script src="../lib/jquery.min.js"></script>
+    <script src="../js/port.js"></script>
+    <script src="../js/functions.js"></script>
   </head>
   <body style="overflow:hidden;">
     <div id="wrapper">

diff --git a/filters/adblock_custom.txt b/filters/adblock_custom.txt
diff --git a/img/white-bg.png b/img/white-bg.png
diff --git a/jquery/jquery.cookie.js b/jquery/jquery.cookie.js
diff --git a/adblock_safari_beforeload.js → js/adblock_safari_beforeload.js b/adblock_safari_beforeload.js → js/adblock_safari_beforeload.js
diff --git a/adblock_safari_contentblocking.js → js/adblock_safari_contentblocking.js b/adblock_safari_contentblocking.js → js/adblock_safari_contentblocking.js
diff --git a/adblock_start_chrome.js → js/adblock_start_chrome.js b/adblock_start_chrome.js → js/adblock_start_chrome.js
diff --git a/adblock_start_common.js → js/adblock_start_common.js b/adblock_start_common.js → js/adblock_start_common.js
diff --git a/adblock_start_safari.js → js/adblock_start_safari.js b/adblock_start_safari.js → js/adblock_start_safari.js
diff --git a/background.js → js/background.js b/background.js → js/background.js
@@ -727,9 +727,9 @@ adblock_is_paused = function(newValue) {
     // add it back when AdBlock is un-paused
     if (SAFARI && !get_settings().safari_content_blocking) {
         if (newValue) {
-            safari.extension.removeContentScript(safari.extension.baseURI + "adblock_safari_beforeload.js");
+            safari.extension.removeContentScript(safari.extension.baseURI + "js/adblock_safari_beforeload.js");
         } else {
-            safari.extension.addContentScriptFromURL(safari.extension.baseURI + "adblock_safari_beforeload.js", [], [], false);
+            safari.extension.addContentScriptFromURL(safari.extension.baseURI + "js/adblock_safari_beforeload.js", [], [], false);
         }
     }
 }
@@ -1000,7 +1000,7 @@ add_custom_filter = function(filter) {
 // Injects jQuery UI
 injectjQueryUI = function() {
     if (SAFARI) {
-        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "jquery/jquery-ui.custom.min.js", [], [], false);
+        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "lib/jquery-ui.custom.min.js", [], [], false);
         return true;
     }
 };
@@ -1071,19 +1071,19 @@ if (!SAFARI) {
             'top_open_whitelist_ui': {
                 allFrames: false,
                 include: [
-                    "punycode.min.js",
-                    "jquery/jquery.min.js",
-                    "jquery/jquery-ui.custom.min.js",
+                    "lib/punycode.min.js",
+                    "lib/jquery.min.js",
+                    "lib/jquery-ui.custom.min.js",
                     "uiscripts/load_jquery_ui.js",
                     "uiscripts/top_open_whitelist_ui.js"
                 ]
             },
             'top_open_blacklist_ui': {
                 allFrames: false,
                 include: [
-                    "punycode.min.js",
-                    "jquery/jquery.min.js",
-                    "jquery/jquery-ui.custom.min.js",
+                    "lib/punycode.min.js",
+                    "lib/jquery.min.js",
+                    "lib/jquery-ui.custom.min.js",
                     "uiscripts/load_jquery_ui.js",
                     "uiscripts/blacklisting/overlay.js",
                     "uiscripts/blacklisting/clickwatcher.js",
@@ -1529,11 +1529,11 @@ chrome.runtime.onMessage.addListener(
     function(request, sender, sendResponse) {
         if (request.command === "inject_jquery") {
             if (!SAFARI) {
-                chrome.tabs.executeScript(undefined, { allFrames: request.allFrames, file: "../jquery/jquery.min.js" },
+                chrome.tabs.executeScript(undefined, { allFrames: request.allFrames, file: "../lib/jquery.min.js" },
                                           function() { sendResponse({});
                                                      });
             } else {
-                safari.extension.addContentScriptFromURL(safari.extension.baseURI + "jquery/jquery.min.js", [], [], false);
+                safari.extension.addContentScriptFromURL(safari.extension.baseURI + "lib/jquery.min.js", [], [], false);
             }
         }
     }

diff --git a/bandaids.js → js/bandaids.js b/bandaids.js → js/bandaids.js
diff --git a/checkupdates.js → js/checkupdates.js b/checkupdates.js → js/checkupdates.js
diff --git a/edge-updates.js → js/edge-updates.js b/edge-updates.js → js/edge-updates.js
diff --git a/functions.js → js/functions.js b/functions.js → js/functions.js
@@ -1,7 +1,7 @@
 // Set to true to get noisier console.log statements
 VERBOSE_DEBUG = false;
 
-// Global variable for detection of Opera, Edge and Safari
+// Global variable for detection of Opera, Edge and Firefox
 OPERA = navigator.userAgent.indexOf("OPR") > -1;
 EDGE = navigator.userAgent.indexOf("Edge") > -1;
 FIREFOX = navigator.userAgent.indexOf("Firefox") > -1;

diff --git a/idlehandler.js → js/idlehandler.js b/idlehandler.js → js/idlehandler.js
diff --git a/port.js → js/port.js b/port.js → js/port.js
diff --git a/safari_bg.js → js/safari_bg.js b/safari_bg.js → js/safari_bg.js
@@ -224,11 +224,11 @@ if (!LEGACY_SAFARI) {
 // Add and remove the specific content script based on the safari_content_blocking setting
 function set_content_scripts() {
     if (get_settings().safari_content_blocking) {
-        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "adblock_safari_contentblocking.js", [], [], false);
-        safari.extension.removeContentScript(safari.extension.baseURI + "adblock_safari_beforeload.js");
+        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "js/adblock_safari_contentblocking.js", [], [], false);
+        safari.extension.removeContentScript(safari.extension.baseURI + "js/adblock_safari_beforeload.js");
     } else {
-        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "adblock_safari_beforeload.js", [], [], false);
-        safari.extension.removeContentScript(safari.extension.baseURI + "adblock_safari_contentblocking.js");
+        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "js/adblock_safari_beforeload.js", [], [], false);
+        safari.extension.removeContentScript(safari.extension.baseURI + "js/adblock_safari_contentblocking.js");
     }
 }
 set_content_scripts();
@@ -237,13 +237,13 @@ safari.application.addEventListener("beforeNavigate", function(event) {
 
     //remove bandaids.js from YouTube.com when a user pauses AdBlock or if the enabled click to flash compatibility mode
     if (/youtube.com/.test(event.url) && (is_adblock_paused() || (get_settings().clicktoflash_compatibility_mode === true))) {
-        safari.extension.removeContentScript(safari.extension.baseURI + "bandaids.js");
+        safari.extension.removeContentScript(safari.extension.baseURI + "js/bandaids.js");
     }
     // YouTube Channel Whitelist
     if (/youtube.com/.test(event.url) && get_settings().youtube_channel_whitelist && !parseUri.parseSearch(event.url).ab_channel) {
-        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "ytchannel.js", [], [], false);
+        safari.extension.addContentScriptFromURL(safari.extension.baseURI + "js/ytchannel.js", [], [], false);
     } else {
-        safari.extension.removeContentScript(safari.extension.baseURI + "ytchannel.js");
+        safari.extension.removeContentScript(safari.extension.baseURI + "js/ytchannel.js");
     }
 }, true);
 

diff --git a/ytchannel.js → js/ytchannel.js b/ytchannel.js → js/ytchannel.js
diff --git a/jquery/jquery-ui.custom.min.js → lib/jquery-ui.custom.min.js b/jquery/jquery-ui.custom.min.js → lib/jquery-ui.custom.min.js
diff --git a/jquery/jquery.min.js → lib/jquery.min.js b/jquery/jquery.min.js → lib/jquery.min.js
diff --git a/punycode.min.js → lib/punycode.min.js b/punycode.min.js → lib/punycode.min.js
diff --git a/manifest.json b/manifest.json
@@ -45,12 +45,12 @@
     {
       "matches": ["http://*/*", "https://*/*"],
       "js": [
-        "port.js",
-        "functions.js",
-        "jquery/jquery.min.js",
+        "lib/jquery.min.js",
+        "js/port.js",
+        "js/functions.js",
         "filtering/filteroptions.js",
-        "adblock_start_common.js",
-        "adblock_start_chrome.js",
+        "js/adblock_start_common.js",
+        "js/adblock_start_chrome.js",
         "catblock/contentscript.js"
       ],
       "run_at": "document_start",