Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Move contentscripts into their own directory. #1424

Merged
merged 2 commits into from
Jun 12, 2017
Merged

Move contentscripts into their own directory. #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0bfe11c
Move contentscripts into their own directory.
cowlicks Jun 9, 2017
7e34001
reflect fingerprint.js move in make-signed-xpi.sh
cowlicks Jun 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion release-utils/make-signed-xpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
0 src/js/clobbercookie.js → src/js/contentscripts/clobbercookie.js
View file
Open in desktop
File renamed without changes.
0 src/js/clobberlocalstorage.js → src/js/contentscripts/clobberlocalstorage.js
View file
Open in desktop
File renamed without changes.
0 src/js/fingerprinting.js → src/js/contentscripts/fingerprinting.js
View file
Open in desktop
File renamed without changes.
0 src/js/socialwidgets.js → src/js/contentscripts/socialwidgets.js
View file
Open in desktop
File renamed without changes.
0 src/js/supercookie.js → src/js/contentscripts/supercookie.js
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions src/manifest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"content_scripts": [
{
"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>"
Expand All @@ -57,7 +57,7 @@
},
{
"js": [
"js/socialwidgets.js"
"js/contentscripts/socialwidgets.js"
],
"matches": [
"<all_urls>"
Expand Down