Minor fixes

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",

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>

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;

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);
     }

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;

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

src/js/background.js

@@ -188,7 +188,6 @@ return {
         popupCollapseBlacklistedDomains: false,
         popupScopeLevel: 'domain',
         processHyperlinkAuditing: true,
-        processReferer: false,
         selectedHostsFiles: [ '' ],
         selectedRecipeFiles: [ '' ],
         userHosts: {

src/js/utils.js

@@ -39,6 +39,7 @@
         }
         details.popup = this.userSettings.alwaysDetachLogger;
     }
+    details.index = -1;
     details.select = true;
     vAPI.tabs.open(details);
 };

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>

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/

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/
 

tools/make-opera-meta.py

@@ -11,6 +11,10 @@
 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 @@
     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)

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/