From 61a538e9f21de1b38cee926c3647f07845b922ba Mon Sep 17 00:00:00 2001 From: gorhill Date: Sat, 5 Aug 2017 09:50:21 -0400 Subject: [PATCH] fix #2843: do not auto open dashboard on Firefox --- platform/webext/options_ui.html | 13 +++++++++++++ tools/make-webext-hybrid.sh | 9 ++++++--- tools/make-webext.sh | 7 +++++-- 3 files changed, 24 insertions(+), 5 deletions(-) create mode 100644 platform/webext/options_ui.html diff --git a/platform/webext/options_ui.html b/platform/webext/options_ui.html new file mode 100644 index 000000000..300959392 --- /dev/null +++ b/platform/webext/options_ui.html @@ -0,0 +1,13 @@ + + + + + + + +
+ + + + + diff --git a/tools/make-webext-hybrid.sh b/tools/make-webext-hybrid.sh index b2282fafa..fb8896369 100755 --- a/tools/make-webext-hybrid.sh +++ b/tools/make-webext-hybrid.sh @@ -22,13 +22,16 @@ cp platform/chromium/*.js $DES/webextension/js/ cp -R platform/chromium/img $DES/webextension/ cp platform/chromium/*.html $DES/webextension/ cp platform/chromium/*.json $DES/webextension/ -cp platform/webext/polyfill.js $DES/webextension/js/ -cp platform/webext/vapi-usercss.js $DES/webextension/js/ -cp platform/webext/manifest.json $DES/webextension/ cp LICENSE.txt $DES/webextension/ +cp platform/webext/manifest.json $DES/webextension/ cp platform/webext/background.html $DES/webextension/ +cp platform/webext/options_ui.html $DES/webextension/ +cp platform/webext/polyfill.js $DES/webextension/js/ +cp platform/webext/vapi-usercss.js $DES/webextension/js/ cp platform/webext/from-legacy.js $DES/webextension/js/ +rm $DES/webextension/js/options_ui.js + cp platform/webext/bootstrap.js $DES/ cp platform/webext/chrome.manifest $DES/ cp platform/webext/install.rdf $DES/ diff --git a/tools/make-webext.sh b/tools/make-webext.sh index 1e5fdfcab..38f183fc8 100755 --- a/tools/make-webext.sh +++ b/tools/make-webext.sh @@ -22,10 +22,13 @@ cp platform/chromium/*.js $DES/js/ cp -R platform/chromium/img $DES/ cp platform/chromium/*.html $DES/ cp platform/chromium/*.json $DES/ +cp LICENSE.txt $DES/ + +cp platform/webext/manifest.json $DES/ +cp platform/webext/options_ui.html $DES/ cp platform/webext/polyfill.js $DES/js/ cp platform/webext/vapi-usercss.js $DES/js/ -cp platform/webext/manifest.json $DES/ -cp LICENSE.txt $DES/ +rm $DES/js/options_ui.js echo "*** uBlock0.webext: Generating meta..." python tools/make-webext-meta.py $DES/