reorganizing, preparing move to vAPI

10 years ago · 63aa4be9f7
81 changed files with 75 additions and 7 deletions
--- a/platform/chromium/img/browsericons/icon19-0.png
+++ b/platform/chromium/img/browsericons/icon19-0.png
--- a/platform/chromium/img/browsericons/icon19-1.png
+++ b/platform/chromium/img/browsericons/icon19-1.png
--- a/platform/chromium/img/browsericons/icon19-10.png
+++ b/platform/chromium/img/browsericons/icon19-10.png
--- a/platform/chromium/img/browsericons/icon19-11.png
+++ b/platform/chromium/img/browsericons/icon19-11.png
--- a/platform/chromium/img/browsericons/icon19-12.png
+++ b/platform/chromium/img/browsericons/icon19-12.png
--- a/platform/chromium/img/browsericons/icon19-13.png
+++ b/platform/chromium/img/browsericons/icon19-13.png
--- a/platform/chromium/img/browsericons/icon19-14.png
+++ b/platform/chromium/img/browsericons/icon19-14.png
--- a/platform/chromium/img/browsericons/icon19-15.png
+++ b/platform/chromium/img/browsericons/icon19-15.png
--- a/platform/chromium/img/browsericons/icon19-16.png
+++ b/platform/chromium/img/browsericons/icon19-16.png
--- a/platform/chromium/img/browsericons/icon19-17.png
+++ b/platform/chromium/img/browsericons/icon19-17.png
--- a/platform/chromium/img/browsericons/icon19-18.png
+++ b/platform/chromium/img/browsericons/icon19-18.png
--- a/platform/chromium/img/browsericons/icon19-19.png
+++ b/platform/chromium/img/browsericons/icon19-19.png
--- a/platform/chromium/img/browsericons/icon19-2.png
+++ b/platform/chromium/img/browsericons/icon19-2.png
--- a/platform/chromium/img/browsericons/icon19-3.png
+++ b/platform/chromium/img/browsericons/icon19-3.png
--- a/platform/chromium/img/browsericons/icon19-4.png
+++ b/platform/chromium/img/browsericons/icon19-4.png
--- a/platform/chromium/img/browsericons/icon19-5.png
+++ b/platform/chromium/img/browsericons/icon19-5.png
--- a/platform/chromium/img/browsericons/icon19-6.png
+++ b/platform/chromium/img/browsericons/icon19-6.png
--- a/platform/chromium/img/browsericons/icon19-7.png
+++ b/platform/chromium/img/browsericons/icon19-7.png
--- a/platform/chromium/img/browsericons/icon19-8.png
+++ b/platform/chromium/img/browsericons/icon19-8.png
--- a/platform/chromium/img/browsericons/icon19-9.png
+++ b/platform/chromium/img/browsericons/icon19-9.png
--- a/platform/chromium/img/browsericons/icon19.png
+++ b/platform/chromium/img/browsericons/icon19.png
--- a/platform/chromium/img/browsericons/icon38.png
+++ b/platform/chromium/img/browsericons/icon38.png
--- a/platform/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": {
--- a/platform/chromium/options_ui.html
+++ b/platform/chromium/options_ui.html
@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<head>
+<script src="js/vapi-client.js"></script>
+<script src="js/options_ui.js"></script>
+<title></title>
+</head>
+<body>
+</body>
+</html>
--- a/platform/chromium/options_ui.js
+++ 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();
+
+/******************************************************************************/
+
+})();
+
+/******************************************************************************/
--- a/tools/_locales/am/messages.json
+++ b/tools/_locales/am/messages.json
--- a/tools/_locales/ar/messages.json
+++ b/tools/_locales/ar/messages.json
--- a/tools/_locales/bg/messages.json
+++ b/tools/_locales/bg/messages.json
--- a/tools/_locales/bn/messages.json
+++ b/tools/_locales/bn/messages.json
--- a/tools/_locales/ca/messages.json
+++ b/tools/_locales/ca/messages.json
--- a/tools/_locales/cs/messages.json
+++ b/tools/_locales/cs/messages.json
--- a/tools/_locales/da/messages.json
+++ b/tools/_locales/da/messages.json
--- a/tools/_locales/de/messages.json
+++ b/tools/_locales/de/messages.json
--- a/tools/_locales/el/messages.json
+++ b/tools/_locales/el/messages.json
--- a/tools/_locales/en/messages.json
+++ b/tools/_locales/en/messages.json
--- a/tools/_locales/en_GB/messages.json
+++ b/tools/_locales/en_GB/messages.json
--- a/tools/_locales/es/messages.json
+++ b/tools/_locales/es/messages.json
--- a/tools/_locales/et/messages.json
+++ b/tools/_locales/et/messages.json
--- a/tools/_locales/fa/messages.json
+++ b/tools/_locales/fa/messages.json
--- a/tools/_locales/fi/messages.json
+++ b/tools/_locales/fi/messages.json
--- a/tools/_locales/fil/messages.json
+++ b/tools/_locales/fil/messages.json
--- a/tools/_locales/fr/messages.json
+++ b/tools/_locales/fr/messages.json
--- a/tools/_locales/gu/messages.json
+++ b/tools/_locales/gu/messages.json
--- a/tools/_locales/he/messages.json
+++ b/tools/_locales/he/messages.json
--- a/tools/_locales/hi/messages.json
+++ b/tools/_locales/hi/messages.json
--- a/tools/_locales/hr/messages.json
+++ b/tools/_locales/hr/messages.json
--- a/tools/_locales/hu/messages.json
+++ b/tools/_locales/hu/messages.json
--- a/tools/_locales/id/messages.json
+++ b/tools/_locales/id/messages.json
--- a/tools/_locales/it/messages.json
+++ b/tools/_locales/it/messages.json
--- a/tools/_locales/ja/messages.json
+++ b/tools/_locales/ja/messages.json
--- a/tools/_locales/kn/messages.json
+++ b/tools/_locales/kn/messages.json
--- a/tools/_locales/ko/messages.json
+++ b/tools/_locales/ko/messages.json
--- a/tools/_locales/lt/messages.json
+++ b/tools/_locales/lt/messages.json
--- a/tools/_locales/lv/messages.json
+++ b/tools/_locales/lv/messages.json
--- a/tools/_locales/ml/messages.json
+++ b/tools/_locales/ml/messages.json
--- a/tools/_locales/mr/messages.json
+++ b/tools/_locales/mr/messages.json
--- a/tools/_locales/ms/messages.json
+++ b/tools/_locales/ms/messages.json
--- a/tools/_locales/nb/messages.json
+++ b/tools/_locales/nb/messages.json
--- a/tools/_locales/nl/messages.json
+++ b/tools/_locales/nl/messages.json
--- a/tools/_locales/pl/messages.json
+++ b/tools/_locales/pl/messages.json
--- a/tools/_locales/pt_BR/messages.json
+++ b/tools/_locales/pt_BR/messages.json
--- a/tools/_locales/pt_PT/messages.json
+++ b/tools/_locales/pt_PT/messages.json
--- a/tools/_locales/ro/messages.json
+++ b/tools/_locales/ro/messages.json
--- a/tools/_locales/ru/messages.json
+++ b/tools/_locales/ru/messages.json
--- a/tools/_locales/sk/messages.json
+++ b/tools/_locales/sk/messages.json
--- a/tools/_locales/sl/messages.json
+++ b/tools/_locales/sl/messages.json
--- a/tools/_locales/sr/messages.json
+++ b/tools/_locales/sr/messages.json
--- a/tools/_locales/sv/messages.json
+++ b/tools/_locales/sv/messages.json
--- a/tools/_locales/sw/messages.json
+++ b/tools/_locales/sw/messages.json
--- a/tools/_locales/ta/messages.json
+++ b/tools/_locales/ta/messages.json
--- a/tools/_locales/te/messages.json
+++ b/tools/_locales/te/messages.json
--- a/tools/_locales/th/messages.json
+++ b/tools/_locales/th/messages.json
--- a/tools/_locales/tr/messages.json
+++ b/tools/_locales/tr/messages.json
--- a/tools/_locales/uk/messages.json
+++ b/tools/_locales/uk/messages.json
--- a/tools/_locales/vi/messages.json
+++ b/tools/_locales/vi/messages.json
--- a/tools/_locales/zh_CN/messages.json
+++ b/tools/_locales/zh_CN/messages.json
--- a/meta/chromium/icon_128.png
+++ b/meta/chromium/icon_128.png
--- a/meta/chromium/icon_16.png
+++ b/meta/chromium/icon_16.png
--- a/meta/chromium/icon_64.png
+++ b/meta/chromium/icon_64.png
--- 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;
--- 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."