Merge pull request #1 from xofe/minor-fixes-3

Minor fixes 3(Rewrite to python3 and long domain names)
kevintde · Jul 18, 2021 · bc2bed4 · bc2bed4
2 parents 1ae27d0 + bda7383
commit bc2bed4
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 7 deletions.
diff --git a/src/css/fa-icons.css b/src/css/fa-icons.css
@@ -40,6 +40,9 @@
 .fa-icon.disabled > .fa-icon-badge {
     display: none;
     }
+.fa-icon.fa-icon-vflipped {
+    transform: scale(1, -1);
+    }
 
 .fa-icon > svg {
     height: 1em;

diff --git a/src/css/popup.css b/src/css/popup.css
@@ -347,10 +347,10 @@ body.tabless .needtab {
     text-align: left;
     }
 .matRow {
-    align-items: flex-start;
     display: flex;
     }
 .matCell {
+    align-items: center;
     box-sizing: content-box;
     display: inline-flex;
     flex-shrink: 0;
@@ -374,6 +374,7 @@ body.tabless .needtab {
     font-weight: 100;
     }
 .paneContent .matrix .matRow > .matCell:first-child > b {
+    display: contents;
     font-weight: normal;
     }
 
@@ -383,9 +384,10 @@ body.tabless .needtab {
     flex-grow: 1;
     flex-shrink: 1;
     justify-content: flex-end;
+    text-align: right;
     unicode-bidi: embed;
     width: 16em;
-    word-break: keep-all;
+    word-break: break-all;
     }
 .matrix .matGroup.g4 .matRow.ro > .matCell:first-child {
     direction: inherit;

diff --git a/src/hosts-files.html b/src/hosts-files.html
@@ -55,7 +55,7 @@
          --><a class="fa-icon mustread" href="" target="_blank">info-circle</a>&#8203;<!--
          --><span class="fa-icon status unsecure" title="http">unlock</span>&#8203;<!--
          --><span class="counts dim status"></span>&#8203;<!--
-         --><span class="fa-icon status obsolete" title="hostsFilesExternalListObsolete">exclamation-triangle</span>&#8203;<!--
+         --><span class="fa-icon status obsolete" data-i18n-title="hostsFilesExternalListObsolete">exclamation-triangle</span>&#8203;<!--
          --><span class="fa-icon status cache">clock</span>&#8203;<!--
          --><span class="fa-icon status updating">spinner</span>&#8203;<!--
          --><span class="fa-icon status failed">unlink</span>

diff --git a/src/js/matrix.js b/src/js/matrix.js
@@ -388,7 +388,9 @@ Matrix.prototype.evaluateCellZ = function(srcHostname, desHostname, type) {
     // srcHostname is '*' at this point
 
     // Preset blacklisted hostnames are blacklisted in global scope
-    if ( type === '*' && µm.ubiquitousBlacklistRef.matches(desHostname) !== -1 ) {
+    // https://github.com/uBlockOrigin/uMatrix-issues/issues/284
+    //   Only consider hostname blocklisted if it's a full match.
+    if ( type === '*' && µm.ubiquitousBlacklistRef.matches(desHostname) === 0 ) {
         return 1;
     }
 

diff --git a/src/js/popup.js b/src/js/popup.js
@@ -1327,6 +1327,7 @@ const gotoExtensionURL = function(ev) {
         what: 'gotoExtensionURL',
         url,
         select: true,
+        index: -1,
         shiftKey: ev.shiftKey,
     });
     dropDownMenuHide();

diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
@@ -19,7 +19,7 @@ cp    ./platform/chromium/manifest.json $DES/
 cp    LICENSE.txt                       $DES/
 
 echo "*** uMatrix.chromium: Generating meta..."
-python tools/make-chromium-meta.py $DES/
+python3 tools/make-chromium-meta.py $DES/
 
 if [ "$1" = all ]; then
     echo "*** uMatrix.chromium: Creating package..."

diff --git a/tools/make-firefox.sh b/tools/make-firefox.sh
@@ -21,7 +21,7 @@ cp    platform/firefox/*.js                 $DES/js/
 cp    platform/firefox/manifest.json        $DES/
 
 echo "*** uMatrix.firefox: Generating meta..."
-python tools/make-firefox-meta.py           $DES/
+python3 tools/make-firefox-meta.py          $DES/
 
 if [ "$1" = all ]; then
     echo "*** uMatrix.firefox: Creating package..."

diff --git a/tools/make-opera.sh b/tools/make-opera.sh
@@ -34,6 +34,6 @@ cp -R ./src/_locales/tr    $DES/_locales/
 cp -R ./src/_locales/zh_TW $DES/_locales/
 
 echo "*** uMatrix.opera: Generating meta..."
-python tools/make-opera-meta.py         $DES/
+python3 tools/make-opera-meta.py        $DES/
 
 echo "*** uMatrix.opera: Package done."