Minor fixes (#1005)

* correct cloud-download/upload icon CSS selectors * fix scope tooltip in logger appearing offscreen * open logger/dashboard links adjacent to current tab (match uBO's behaviour) * opera: fix manifest version not being updated Version code copied from tools/make-chromium-meta.py * fix https://www.reddit.com/r/uBlockOrigin/comments/9gwrna/when_you_right_click_and_go_to_options_it_keeps/ source: * 6dd6dc5f1d * remove unused "processReferer" setting It was changed to a matrix switch in 5d8bae3da2 * remove unused source code source: * f516cd3d26 * 0503f52b1e * remove bold version of Roboto font (unused from HTTPSB) * correct FontAwesome license after change from v5 back to v4.7 License copied from bb737e29d5 * fix build scripts after c0f4abfd00
2024-05-03 20:03:27 +12:00 · 2018-12-30 12:52:52 +00:00 · 2018-12-30 12:52:52 +00:00 · 2045397084
parent 9494da7195
commit 2045397084
18 changed files with 71 additions and 177 deletions
--- a/platform/chromium/manifest.json
+++ b/platform/chromium/manifest.json
@ -36,7 +36,10 @@
    "default_locale": "en",
    "homepage_url": "https://github.com/gorhill/uMatrix/wiki",
    "minimum_chrome_version": "45.0",
-    "options_page": "dashboard.html",
+    "options_ui": {
+        "page": "dashboard.html",
+        "open_in_tab": true
+    },
    "permissions": [
        "browsingData",
        "cookies",
--- a/platform/chromium/options_ui.html
+++ b/platform/chromium/options_ui.html
@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<head>
-<meta charset="utf-8">
-<title></title>
-</head>
-<body>
-<script src="js/vapi-client.js"></script>
-<script src="js/options_ui.js"></script>
-</body>
-</html>
--- a/platform/chromium/options_ui.js
+++ b/platform/chromium/options_ui.js
@ -1,45 +0,0 @@
-/*******************************************************************************
-
-    µ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/src/background.html
+++ b/src/background.html
@ -24,7 +24,6 @@
 <script src="js/cookies.js"></script>
 <script src="js/logger.js"></script>
 <script src="js/messaging.js"></script>
-<script src="js/profiler.js"></script>
 <script src="js/storage.js"></script>
 <script src="js/pagestats.js"></script>
 <script src="js/tab.js"></script>
--- a/src/css/common.css
+++ b/src/css/common.css
@ -4,12 +4,6 @@
  font-weight: normal;
  src: local('httpsb'), url(fonts/Roboto_Condensed/RobotoCondensed-Regular.ttf) format('truetype');
 }
-@font-face {
-  font-family: 'httpsb';
-  font-style: normal;
-  font-weight: bold;
-  src: local('httpsb'), url(fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf) format('truetype');
-}
@font-face {
  font-family: 'httpsb';
  font-style: normal;
--- a/src/css/fa-icons.css
+++ b/src/css/fa-icons.css
@ -45,8 +45,8 @@
    height: 1em;
    width: 1em;
    }
-.fa-icon > .fa-icon_cloud-download-alt,
-.fa-icon > .fa-icon_cloud-upload-alt,
+.fa-icon > .fa-icon_cloud-download,
+.fa-icon > .fa-icon_cloud-upload,
 .fa-icon > .fa-icon_eraser {
    width: calc(1em * 1920 / 1792);
    }
--- a/src/css/fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf
+++ b/src/css/fonts/Roboto_Condensed/RobotoCondensed-Bold.ttf
--- a/src/css/popup.css
+++ b/src/css/popup.css
@ -519,10 +519,6 @@ body.powerOff .matRow.rw .matCell {
    opacity: 0.6;
    }

-.top {
-    font-weight: bold;
-    }
-
 #cellHotspots {
    margin: 0;
    border: 0;
--- a/src/img/fontawesome/LICENSE.txt
+++ b/src/img/fontawesome/LICENSE.txt
@ -1,34 +1,25 @@
-Font Awesome Free License
-------------------------
+# [Font Awesome v4.7.0](http://fontawesome.io)
+### The iconic font and CSS framework

-Font Awesome Free is free, open source, and GPL friendly. You can use it for
-commercial projects, open source projects, or really almost whatever you want.
-Full Font Awesome Free license: https://fontawesome.com/license/free.
+Font Awesome is a full suite of 675 pictographic icons for easy scalable vector graphics on websites,
+created and maintained by [Dave Gandy](https://twitter.com/davegandy).
+Stay up to date with the latest release and announcements on Twitter:
+[@fontawesome](http://twitter.com/fontawesome).

-# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
-In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
-packaged as SVG and JS file types.
+Get started at http://fontawesome.io!

-# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
-In the Font Awesome Free download, the SIL OLF license applies to all icons
-packaged as web and desktop font files.
+## License
+- The Font Awesome font is licensed under the SIL OFL 1.1:
+  - http://scripts.sil.org/OFL
+- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
+  - https://opensource.org/licenses/mit-license.html
+- The Font Awesome documentation is licensed under the CC BY 3.0 License:
+  - http://creativecommons.org/licenses/by/3.0/
+- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
+  - `Font Awesome by Dave Gandy - http://fontawesome.io`
+- Full details: http://fontawesome.io/license/

-# Code: MIT License (https://opensource.org/licenses/MIT)
-In the Font Awesome Free download, the MIT license applies to all non-font and
-non-icon files.
-
-# Attribution
-Attribution is required by MIT, SIL OLF, and CC BY licenses. Downloaded Font
-Awesome Free files already contain embedded comments with sufficient
-attribution, so you shouldn't need to do anything additional when using these
-files normally.
-
-We've kept attribution comments terse, so we ask that you do not actively work
-to remove them from files, especially code. They're a great way for folks to
-learn about Font Awesome.
-
-# Brand Icons
-All brand icons are trademarks of their respective owners. The use of these
-trademarks does not indicate endorsement of the trademark holder by Font
-Awesome, nor vice versa. **Please do not use brand logos for any purpose except
-to represent the company, product, or service to which they refer.**
+## Author
+- Email: dave@fontawesome.io
+- Twitter: http://twitter.com/davegandy
+- GitHub: https://github.com/davegandy
--- a/src/img/fontawesome/fontawesome-defs.svg
+++ b/src/img/fontawesome/fontawesome-defs.svg
@ -1,7 +1,29 @@
 <!--
-Font Awesome Free 5.3.1 by @fontawesome - https://fontawesome.com
-License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
+
+    The SVG definitions were imported piecemeal from:
+        https://github.com/FortAwesome/Font-Awesome/releases/tag/v4.7.0
+        
 -->
+
+<!--
+
+Font Awesome v4.7.0 by Dave Gandy
+https://github.com/FortAwesome/Font-Awesome/tree/a8386aae19e200ddb0f6845b5feeee5eb7013687#font-awesome-v470
+
+License - https://github.com/FortAwesome/Font-Awesome/tree/a8386aae19e200ddb0f6845b5feeee5eb7013687#license:
+
+- The Font Awesome font is licensed under the SIL OFL 1.1:
+  - http://scripts.sil.org/OFL
+- Font Awesome CSS, LESS, and Sass files are licensed under the MIT License:
+  - https://opensource.org/licenses/mit-license.html
+- The Font Awesome documentation is licensed under the CC BY 3.0 License:
+  - http://creativecommons.org/licenses/by/3.0/
+- Attribution is no longer required as of Font Awesome 3.0, but much appreciated:
+  - `Font Awesome by Dave Gandy - http://fontawesome.io`
+- Full details: http://fontawesome.io/license/
+
+-->
+
 <svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" style="display: none;">
    <defs>
    <symbol id="angle-up"             viewBox="0 0  998  582"><path d="m 998,499 q 0,13 -10,23 l -50,50 q -10,10 -23,10 -13,0 -23,-10 L 499,179 106,572 Q 96,582 83,582 70,582 60,572 L 10,522 Q 0,512 0,499 0,486 10,476 L 476,10 q 10,-10 23,-10 13,0 23,10 l 466,466 q 10,10 10,23 z"/></symbol>
@ -37,8 +59,3 @@ License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL
    <symbol id="unlock"               viewBox="0 0 1152 1536"><path d="m 1056,768 q 40,0 68,28 28,28 28,68 l 0,576 q 0,40 -28,68 -28,28 -68,28 l -960,0 Q 56,1536 28,1508 0,1480 0,1440 L 0,864 q 0,-40 28,-68 28,-28 68,-28 l 32,0 0,-320 Q 128,263 259.5,131.5 391,0 576,0 761,0 892.5,131.5 1024,263 1024,448 q 0,26 -19,45 -19,19 -45,19 l -64,0 q -26,0 -45,-19 -19,-19 -19,-45 0,-106 -75,-181 -75,-75 -181,-75 -106,0 -181,75 -75,75 -75,181 l 0,320 736,0 z"/></symbol>
    </defs>
 </svg>
-
-<!--
-    The above definitions were imported piecemeal from:
-        fontawesome-free-5.3.1-web.zip/sprites
-->
--- a/src/js/background.js
+++ b/src/js/background.js
@ -188,7 +188,6 @@ return {
        popupCollapseBlacklistedDomains: false,
        popupScopeLevel: 'domain',
        processHyperlinkAuditing: true,
-        processReferer: false,
        selectedHostsFiles: [ '' ],
        selectedRecipeFiles: [ '' ],
        userHosts: {
--- a/src/js/profiler.js
+++ b/src/js/profiler.js
@ -1,62 +0,0 @@
-/*******************************************************************************
-
-    µMatrix - a Chromium browser extension to black/white list requests.
-    Copyright (C) 2014  Raymond Hill
-
-    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/uMatrix
-*/
-
-/******************************************************************************/
-
-var quickProfiler = (function() {
-    var timer = performance;
-    var time = 0;
-    var count = 0;
-    var tstart = 0;
-    var lastlog = timer.now();
-    var prompt = '';
-    var reset = function() {
-        time = 0;
-        count = 0;
-        tstart = 0;
-    };
-    var avg = function() {
-        return count > 0 ? time / count : 0;
-    };
-    var start = function(s) {
-        prompt = s || '';
-        tstart = timer.now();
-    };
-    var stop = function(period) {
-        if ( period === undefined ) {
-            period = 10000;
-        }
-        var now = timer.now();
-        count += 1;
-        time += (now - tstart);
-        if ( (now - lastlog) >= period ) {
-            console.log('µMatrix> %s: %s ms (%d samples)', prompt, avg().toFixed(3), count);
-            lastlog = now;
-        }
-    };
-    return {
-        reset: reset,
-        start: start,
-        stop: stop
-    };
-})();
-
-/******************************************************************************/
--- a/src/js/utils.js
+++ b/src/js/utils.js
@ -39,6 +39,7 @@
        }
        details.popup = this.userSettings.alwaysDetachLogger;
    }
+    details.index = -1;
    details.select = true;
    vAPI.tabs.open(details);
 };
--- a/src/logger-ui.html
+++ b/src/logger-ui.html
@ -48,7 +48,7 @@
        <div class="dialog">
            <section class="scopeWidget">
                <span class="scope" id="specificScope"><span>&nbsp;</span></span><!--
-             --><span class="scope" id="globalScope" data-scope="*" data-i18n-tip="matrixGlobalScopeTip"><span><span>&#x2217;</span></span></span>
+             --><span class="scope tip-anchor-right" id="globalScope" data-scope="*" data-i18n-tip="matrixGlobalScopeTip"><span><span>&#x2217;</span></span></span>
                <div class="ruleEditorToolbar">
                    <span id="matrixReloadButton" class="fa-icon tip-anchor-right" data-i18n-tip="matrixReloadButton">refresh</span>
                </div>
--- a/tools/make-chromium.sh
+++ b/tools/make-chromium.sh
@ -13,7 +13,6 @@ bash ./tools/make-assets.sh $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/
--- a/tools/make-firefox.sh
+++ b/tools/make-firefox.sh
@ -12,7 +12,6 @@ mkdir -p $DES
 bash ./tools/make-assets.sh $DES

 cp -R ./src/*                               $DES/
-cp    platform/chromium/*.html              $DES/
 cp    platform/chromium/*.js                $DES/js/
 cp -R platform/chromium/img/*               $DES/img/
 cp    LICENSE.txt                           $DES/
@ -21,10 +20,6 @@ cp    platform/firefox/polyfill.js          $DES/js/
 cp    platform/firefox/vapi-cachestorage.js $DES/js/
 cp    platform/firefox/manifest.json        $DES/

-# firefox-specific
-rm $DES/options_ui.html
-rm $DES/js/options_ui.js
-
 echo "*** uMatrix.firefox: Generating meta..."
 python tools/make-firefox-meta.py           $DES/

--- a/tools/make-opera-meta.py
+++ b/tools/make-opera-meta.py
@ -11,6 +11,10 @@ if len(sys.argv) == 1 or not sys.argv[1]:
 proj_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], '..')
 build_dir = os.path.abspath(sys.argv[1])

+version = ''
+with open(os.path.join(proj_dir, 'dist', 'version')) as f:
+    version = f.read().strip()
+
 # Import data from chromium platform
 chromium_manifest = {}
 opera_manifest = {}
@ -28,6 +32,20 @@ for key in chromium_manifest:
    if key not in opera_manifest:
        opera_manifest[key] = chromium_manifest[key]

+# Development build? If so, modify name accordingly.
+match = re.search('^(\d+\.\d+\.\d+)(\.|b|rc)(\d+)$', version)
+if match:
+    version = match.group(1)
+    revision = int(match.group(3))
+    if match.group(2) == 'rc':
+        revision += 100
+    version += '.' + str(revision)
+    opera_manifest['name'] += ' development build'
+    opera_manifest['short_name'] += ' dev build'
+    opera_manifest['browser_action']['default_title'] += ' dev build'
+
+opera_manifest['version'] = version
+
 opera_manifest_file = os.path.join(build_dir, 'manifest.json')
 with open(opera_manifest_file, 'w') as f2:
    json.dump(opera_manifest, f2, indent=2, separators=(',', ': '), sort_keys=True)
--- a/tools/make-opera.sh
+++ b/tools/make-opera.sh
@ -12,7 +12,6 @@ mkdir -p $DES
 bash ./tools/make-assets.sh $DES

 cp -R ./src/*                           $DES/
-cp    ./platform/chromium/*.html        $DES/
 cp    ./platform/chromium/*.js          $DES/js/
 cp -R ./platform/chromium/img/*         $DES/img/
 cp    ./platform/chromium/manifest.json $DES/