Merge pull request #1424.

Move contentscripts into their own directory. Conflicts: src/manifest.json
EFForg · Jun 12, 2017 · dfce0b8 · dfce0b8
2 parents 77d53c7 + 7e34001
commit dfce0b8
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 6 deletions.
diff --git a/release-utils/make-signed-xpi.sh b/release-utils/make-signed-xpi.sh
@@ -29,7 +29,7 @@ fi
 
 # TODO restore: https://github.com/EFForg/privacybadger/issues/1158
 echo "remove fingerprinting"
-sed -i '/        "js\/fingerprinting.js",/d' ../checkout/src/manifest.json
+sed -i '/        "js\/contentscripts\/fingerprinting.js",/d' ../checkout/src/manifest.json
 
 echo "change author value"
 sed -i 's/"author": { "email": "[email protected]" },/"author": "[email protected]",/' ../checkout/src/manifest.json

diff --git a/src/js/clobbercookie.js → src/js/contentscripts/clobbercookie.js b/src/js/clobbercookie.js → src/js/contentscripts/clobbercookie.js
diff --git a/src/js/clobberlocalstorage.js → src/js/contentscripts/clobberlocalstorage.js b/src/js/clobberlocalstorage.js → src/js/contentscripts/clobberlocalstorage.js
diff --git a/src/js/fingerprinting.js → src/js/contentscripts/fingerprinting.js b/src/js/fingerprinting.js → src/js/contentscripts/fingerprinting.js
diff --git a/src/js/socialwidgets.js → src/js/contentscripts/socialwidgets.js b/src/js/socialwidgets.js → src/js/contentscripts/socialwidgets.js
diff --git a/src/js/supercookie.js → src/js/contentscripts/supercookie.js b/src/js/supercookie.js → src/js/contentscripts/supercookie.js
diff --git a/src/manifest.json b/src/manifest.json
@@ -54,10 +54,10 @@
     },
     {
       "js": [
-        "js/clobbercookie.js",
-        "js/clobberlocalstorage.js",
-        "js/fingerprinting.js",
-        "js/supercookie.js"
+        "js/contentscripts/clobbercookie.js",
+        "js/contentscripts/clobberlocalstorage.js",
+        "js/contentscripts/fingerprinting.js",
+        "js/contentscripts/supercookie.js"
       ],
       "matches": [
         "<all_urls>"
@@ -67,7 +67,7 @@
     },
     {
       "js": [
-	"js/socialwidgets.js"
+	"js/contentscripts/socialwidgets.js"
       ],
       "matches": [
         "<all_urls>"