diff --git a/src/img/browsericons/icon19-0.png b/platform/chromium/img/browsericons/icon19-0.png similarity index 100% rename from src/img/browsericons/icon19-0.png rename to platform/chromium/img/browsericons/icon19-0.png diff --git a/src/img/browsericons/icon19-1.png b/platform/chromium/img/browsericons/icon19-1.png similarity index 100% rename from src/img/browsericons/icon19-1.png rename to platform/chromium/img/browsericons/icon19-1.png diff --git a/src/img/browsericons/icon19-10.png b/platform/chromium/img/browsericons/icon19-10.png similarity index 100% rename from src/img/browsericons/icon19-10.png rename to platform/chromium/img/browsericons/icon19-10.png diff --git a/src/img/browsericons/icon19-11.png b/platform/chromium/img/browsericons/icon19-11.png similarity index 100% rename from src/img/browsericons/icon19-11.png rename to platform/chromium/img/browsericons/icon19-11.png diff --git a/src/img/browsericons/icon19-12.png b/platform/chromium/img/browsericons/icon19-12.png similarity index 100% rename from src/img/browsericons/icon19-12.png rename to platform/chromium/img/browsericons/icon19-12.png diff --git a/src/img/browsericons/icon19-13.png b/platform/chromium/img/browsericons/icon19-13.png similarity index 100% rename from src/img/browsericons/icon19-13.png rename to platform/chromium/img/browsericons/icon19-13.png diff --git a/src/img/browsericons/icon19-14.png b/platform/chromium/img/browsericons/icon19-14.png similarity index 100% rename from src/img/browsericons/icon19-14.png rename to platform/chromium/img/browsericons/icon19-14.png diff --git a/src/img/browsericons/icon19-15.png b/platform/chromium/img/browsericons/icon19-15.png similarity index 100% rename from src/img/browsericons/icon19-15.png rename to platform/chromium/img/browsericons/icon19-15.png diff --git a/src/img/browsericons/icon19-16.png b/platform/chromium/img/browsericons/icon19-16.png similarity index 100% rename from src/img/browsericons/icon19-16.png rename to platform/chromium/img/browsericons/icon19-16.png diff --git a/src/img/browsericons/icon19-17.png b/platform/chromium/img/browsericons/icon19-17.png similarity index 100% rename from src/img/browsericons/icon19-17.png rename to platform/chromium/img/browsericons/icon19-17.png diff --git a/src/img/browsericons/icon19-18.png b/platform/chromium/img/browsericons/icon19-18.png similarity index 100% rename from src/img/browsericons/icon19-18.png rename to platform/chromium/img/browsericons/icon19-18.png diff --git a/src/img/browsericons/icon19-19.png b/platform/chromium/img/browsericons/icon19-19.png similarity index 100% rename from src/img/browsericons/icon19-19.png rename to platform/chromium/img/browsericons/icon19-19.png diff --git a/src/img/browsericons/icon19-2.png b/platform/chromium/img/browsericons/icon19-2.png similarity index 100% rename from src/img/browsericons/icon19-2.png rename to platform/chromium/img/browsericons/icon19-2.png diff --git a/src/img/browsericons/icon19-3.png b/platform/chromium/img/browsericons/icon19-3.png similarity index 100% rename from src/img/browsericons/icon19-3.png rename to platform/chromium/img/browsericons/icon19-3.png diff --git a/src/img/browsericons/icon19-4.png b/platform/chromium/img/browsericons/icon19-4.png similarity index 100% rename from src/img/browsericons/icon19-4.png rename to platform/chromium/img/browsericons/icon19-4.png diff --git a/src/img/browsericons/icon19-5.png b/platform/chromium/img/browsericons/icon19-5.png similarity index 100% rename from src/img/browsericons/icon19-5.png rename to platform/chromium/img/browsericons/icon19-5.png diff --git a/src/img/browsericons/icon19-6.png b/platform/chromium/img/browsericons/icon19-6.png similarity index 100% rename from src/img/browsericons/icon19-6.png rename to platform/chromium/img/browsericons/icon19-6.png diff --git a/src/img/browsericons/icon19-7.png b/platform/chromium/img/browsericons/icon19-7.png similarity index 100% rename from src/img/browsericons/icon19-7.png rename to platform/chromium/img/browsericons/icon19-7.png diff --git a/src/img/browsericons/icon19-8.png b/platform/chromium/img/browsericons/icon19-8.png similarity index 100% rename from src/img/browsericons/icon19-8.png rename to platform/chromium/img/browsericons/icon19-8.png diff --git a/src/img/browsericons/icon19-9.png b/platform/chromium/img/browsericons/icon19-9.png similarity index 100% rename from src/img/browsericons/icon19-9.png rename to platform/chromium/img/browsericons/icon19-9.png diff --git a/src/img/browsericons/icon19.png b/platform/chromium/img/browsericons/icon19.png similarity index 100% rename from src/img/browsericons/icon19.png rename to platform/chromium/img/browsericons/icon19.png diff --git a/src/img/browsericons/icon38.png b/platform/chromium/img/browsericons/icon38.png similarity index 100% rename from src/img/browsericons/icon38.png rename to platform/chromium/img/browsericons/icon38.png diff --git a/meta/chromium/manifest.json b/platform/chromium/manifest.json similarity index 97% rename from meta/chromium/manifest.json rename to platform/chromium/manifest.json index 6990a6a..36310c7 100644 --- a/meta/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -5,8 +5,8 @@ "version": "0.8.1.4", "description": "__MSG_extShortDesc__", "icons": { - "16": "icon_16.png", - "128": "icon_128.png" + "16": "img/icon_16.png", + "128": "img/icon_128.png" }, "browser_action": { "default_icon": { diff --git a/platform/chromium/options_ui.html b/platform/chromium/options_ui.html new file mode 100644 index 0000000..9338070 --- /dev/null +++ b/platform/chromium/options_ui.html @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/platform/chromium/options_ui.js b/platform/chromium/options_ui.js new file mode 100644 index 0000000..8a7a03f --- /dev/null +++ b/platform/chromium/options_ui.js @@ -0,0 +1,45 @@ +/******************************************************************************* + + µBlock - a browser extension to block requests. + Copyright (C) 2015 The µBlock authors + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see {http://www.gnu.org/licenses/}. + + Home: https://github.com/gorhill/uBlock +*/ + +/******************************************************************************/ + +(function() { + +/******************************************************************************/ + +'use strict'; + +var messager = vAPI.messaging.channel('_open'); +messager.send({ + what: 'gotoURL', + details: { + url: 'dashboard.html', + select: true, + index: -1 + } +}); +window.close(); + +/******************************************************************************/ + +})(); + +/******************************************************************************/ diff --git a/tools/_locales/am/messages.json b/src/_locales/am/messages.json similarity index 100% rename from tools/_locales/am/messages.json rename to src/_locales/am/messages.json diff --git a/tools/_locales/ar/messages.json b/src/_locales/ar/messages.json similarity index 100% rename from tools/_locales/ar/messages.json rename to src/_locales/ar/messages.json diff --git a/tools/_locales/bg/messages.json b/src/_locales/bg/messages.json similarity index 100% rename from tools/_locales/bg/messages.json rename to src/_locales/bg/messages.json diff --git a/tools/_locales/bn/messages.json b/src/_locales/bn/messages.json similarity index 100% rename from tools/_locales/bn/messages.json rename to src/_locales/bn/messages.json diff --git a/tools/_locales/ca/messages.json b/src/_locales/ca/messages.json similarity index 100% rename from tools/_locales/ca/messages.json rename to src/_locales/ca/messages.json diff --git a/tools/_locales/cs/messages.json b/src/_locales/cs/messages.json similarity index 100% rename from tools/_locales/cs/messages.json rename to src/_locales/cs/messages.json diff --git a/tools/_locales/da/messages.json b/src/_locales/da/messages.json similarity index 100% rename from tools/_locales/da/messages.json rename to src/_locales/da/messages.json diff --git a/tools/_locales/de/messages.json b/src/_locales/de/messages.json similarity index 100% rename from tools/_locales/de/messages.json rename to src/_locales/de/messages.json diff --git a/tools/_locales/el/messages.json b/src/_locales/el/messages.json similarity index 100% rename from tools/_locales/el/messages.json rename to src/_locales/el/messages.json diff --git a/tools/_locales/en/messages.json b/src/_locales/en/messages.json similarity index 100% rename from tools/_locales/en/messages.json rename to src/_locales/en/messages.json diff --git a/tools/_locales/en_GB/messages.json b/src/_locales/en_GB/messages.json similarity index 100% rename from tools/_locales/en_GB/messages.json rename to src/_locales/en_GB/messages.json diff --git a/tools/_locales/es/messages.json b/src/_locales/es/messages.json similarity index 100% rename from tools/_locales/es/messages.json rename to src/_locales/es/messages.json diff --git a/tools/_locales/et/messages.json b/src/_locales/et/messages.json similarity index 100% rename from tools/_locales/et/messages.json rename to src/_locales/et/messages.json diff --git a/tools/_locales/fa/messages.json b/src/_locales/fa/messages.json similarity index 100% rename from tools/_locales/fa/messages.json rename to src/_locales/fa/messages.json diff --git a/tools/_locales/fi/messages.json b/src/_locales/fi/messages.json similarity index 100% rename from tools/_locales/fi/messages.json rename to src/_locales/fi/messages.json diff --git a/tools/_locales/fil/messages.json b/src/_locales/fil/messages.json similarity index 100% rename from tools/_locales/fil/messages.json rename to src/_locales/fil/messages.json diff --git a/tools/_locales/fr/messages.json b/src/_locales/fr/messages.json similarity index 100% rename from tools/_locales/fr/messages.json rename to src/_locales/fr/messages.json diff --git a/tools/_locales/gu/messages.json b/src/_locales/gu/messages.json similarity index 100% rename from tools/_locales/gu/messages.json rename to src/_locales/gu/messages.json diff --git a/tools/_locales/he/messages.json b/src/_locales/he/messages.json similarity index 100% rename from tools/_locales/he/messages.json rename to src/_locales/he/messages.json diff --git a/tools/_locales/hi/messages.json b/src/_locales/hi/messages.json similarity index 100% rename from tools/_locales/hi/messages.json rename to src/_locales/hi/messages.json diff --git a/tools/_locales/hr/messages.json b/src/_locales/hr/messages.json similarity index 100% rename from tools/_locales/hr/messages.json rename to src/_locales/hr/messages.json diff --git a/tools/_locales/hu/messages.json b/src/_locales/hu/messages.json similarity index 100% rename from tools/_locales/hu/messages.json rename to src/_locales/hu/messages.json diff --git a/tools/_locales/id/messages.json b/src/_locales/id/messages.json similarity index 100% rename from tools/_locales/id/messages.json rename to src/_locales/id/messages.json diff --git a/tools/_locales/it/messages.json b/src/_locales/it/messages.json similarity index 100% rename from tools/_locales/it/messages.json rename to src/_locales/it/messages.json diff --git a/tools/_locales/ja/messages.json b/src/_locales/ja/messages.json similarity index 100% rename from tools/_locales/ja/messages.json rename to src/_locales/ja/messages.json diff --git a/tools/_locales/kn/messages.json b/src/_locales/kn/messages.json similarity index 100% rename from tools/_locales/kn/messages.json rename to src/_locales/kn/messages.json diff --git a/tools/_locales/ko/messages.json b/src/_locales/ko/messages.json similarity index 100% rename from tools/_locales/ko/messages.json rename to src/_locales/ko/messages.json diff --git a/tools/_locales/lt/messages.json b/src/_locales/lt/messages.json similarity index 100% rename from tools/_locales/lt/messages.json rename to src/_locales/lt/messages.json diff --git a/tools/_locales/lv/messages.json b/src/_locales/lv/messages.json similarity index 100% rename from tools/_locales/lv/messages.json rename to src/_locales/lv/messages.json diff --git a/tools/_locales/ml/messages.json b/src/_locales/ml/messages.json similarity index 100% rename from tools/_locales/ml/messages.json rename to src/_locales/ml/messages.json diff --git a/tools/_locales/mr/messages.json b/src/_locales/mr/messages.json similarity index 100% rename from tools/_locales/mr/messages.json rename to src/_locales/mr/messages.json diff --git a/tools/_locales/ms/messages.json b/src/_locales/ms/messages.json similarity index 100% rename from tools/_locales/ms/messages.json rename to src/_locales/ms/messages.json diff --git a/tools/_locales/nb/messages.json b/src/_locales/nb/messages.json similarity index 100% rename from tools/_locales/nb/messages.json rename to src/_locales/nb/messages.json diff --git a/tools/_locales/nl/messages.json b/src/_locales/nl/messages.json similarity index 100% rename from tools/_locales/nl/messages.json rename to src/_locales/nl/messages.json diff --git a/tools/_locales/pl/messages.json b/src/_locales/pl/messages.json similarity index 100% rename from tools/_locales/pl/messages.json rename to src/_locales/pl/messages.json diff --git a/tools/_locales/pt_BR/messages.json b/src/_locales/pt_BR/messages.json similarity index 100% rename from tools/_locales/pt_BR/messages.json rename to src/_locales/pt_BR/messages.json diff --git a/tools/_locales/pt_PT/messages.json b/src/_locales/pt_PT/messages.json similarity index 100% rename from tools/_locales/pt_PT/messages.json rename to src/_locales/pt_PT/messages.json diff --git a/tools/_locales/ro/messages.json b/src/_locales/ro/messages.json similarity index 100% rename from tools/_locales/ro/messages.json rename to src/_locales/ro/messages.json diff --git a/tools/_locales/ru/messages.json b/src/_locales/ru/messages.json similarity index 100% rename from tools/_locales/ru/messages.json rename to src/_locales/ru/messages.json diff --git a/tools/_locales/sk/messages.json b/src/_locales/sk/messages.json similarity index 100% rename from tools/_locales/sk/messages.json rename to src/_locales/sk/messages.json diff --git a/tools/_locales/sl/messages.json b/src/_locales/sl/messages.json similarity index 100% rename from tools/_locales/sl/messages.json rename to src/_locales/sl/messages.json diff --git a/tools/_locales/sr/messages.json b/src/_locales/sr/messages.json similarity index 100% rename from tools/_locales/sr/messages.json rename to src/_locales/sr/messages.json diff --git a/tools/_locales/sv/messages.json b/src/_locales/sv/messages.json similarity index 100% rename from tools/_locales/sv/messages.json rename to src/_locales/sv/messages.json diff --git a/tools/_locales/sw/messages.json b/src/_locales/sw/messages.json similarity index 100% rename from tools/_locales/sw/messages.json rename to src/_locales/sw/messages.json diff --git a/tools/_locales/ta/messages.json b/src/_locales/ta/messages.json similarity index 100% rename from tools/_locales/ta/messages.json rename to src/_locales/ta/messages.json diff --git a/tools/_locales/te/messages.json b/src/_locales/te/messages.json similarity index 100% rename from tools/_locales/te/messages.json rename to src/_locales/te/messages.json diff --git a/tools/_locales/th/messages.json b/src/_locales/th/messages.json similarity index 100% rename from tools/_locales/th/messages.json rename to src/_locales/th/messages.json diff --git a/tools/_locales/tr/messages.json b/src/_locales/tr/messages.json similarity index 100% rename from tools/_locales/tr/messages.json rename to src/_locales/tr/messages.json diff --git a/tools/_locales/uk/messages.json b/src/_locales/uk/messages.json similarity index 100% rename from tools/_locales/uk/messages.json rename to src/_locales/uk/messages.json diff --git a/tools/_locales/vi/messages.json b/src/_locales/vi/messages.json similarity index 100% rename from tools/_locales/vi/messages.json rename to src/_locales/vi/messages.json diff --git a/tools/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json similarity index 100% rename from tools/_locales/zh_CN/messages.json rename to src/_locales/zh_CN/messages.json diff --git a/meta/chromium/icon_128.png b/src/img/icon_128.png similarity index 100% rename from meta/chromium/icon_128.png rename to src/img/icon_128.png diff --git a/meta/chromium/icon_16.png b/src/img/icon_16.png similarity index 100% rename from meta/chromium/icon_16.png rename to src/img/icon_16.png diff --git a/meta/chromium/icon_64.png b/src/img/icon_64.png similarity index 100% rename from meta/chromium/icon_64.png rename to src/img/icon_64.png diff --git a/src/js/async.js b/src/js/async.js index b6cc7ae..e6c5b62 100644 --- a/src/js/async.js +++ b/src/js/async.js @@ -156,7 +156,7 @@ return asyncJobManager; if ( typeof tabId !== 'number' || tabId <= 0 ) { return; } - µm.asyncJobs.add('updateBadge-' + tabId, tabId, updateBadge, 250); + µm.asyncJobs.add('updateBadge-' + tabId, tabId, updateBadge, 500); }; return updateBadgeAsync; diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh index e566ec7..bb907ee 100755 --- a/tools/make-chromium.sh +++ b/tools/make-chromium.sh @@ -4,11 +4,25 @@ echo "*** µMatrix(Chromium): Creating package" echo "*** µMatrix(Chromium): Copying files" + DES=./dist/uMatrix.chromium rm -rf $DES mkdir -p $DES -cp -R ./src/* $DES -cp -R ./tools/_locales $DES -cp -R ./assets $DES -cp ./meta/chromium/* $DES + +cp -R ./assets $DES/ +cp -R ./src/* $DES/ +cp -R $DES/_locales/nb $DES/_locales/no # Chrome store quirk +cp ./platform/chromium/*.html $DES/ +cp ./platform/chromium/*.js $DES/js/ +cp -R ./platform/chromium/img/* $DES/img/ +cp ./platform/chromium/manifest.json $DES/ +cp LICENSE $DES/ + +if [ "$1" = all ]; then + echo "*** µMatrix.chromium: Creating package..." + pushd $(dirname $DES/) + zip uMatrix.chromium.zip -qr $(basename $DES/)/* + popd +fi + echo "*** µMatrix(Chromium): Package done."