From c9ddc9d5d05a08bb092ecbd0a05de7ae9fd6cd67 Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 06:11:28 +0000
Subject: [PATCH 1/6] Only consider hostname blocklisted if it's a full match
Fixes https://github.com/uBlockOrigin/uMatrix-issues/issues/284
---
src/js/matrix.js | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/js/matrix.js b/src/js/matrix.js
index 7a19b68..3fafe52 100644
--- 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;
}
From 93edb4aca047272660da17c72a304db90b6f2ded Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 06:15:30 +0000
Subject: [PATCH 2/6] Call `python3` rather than `python` in build scripts
This prevents the build scripts failing when Python 2 isn't installed.
---
tools/make-chromium.sh | 2 +-
tools/make-firefox.sh | 2 +-
tools/make-opera.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/make-chromium.sh b/tools/make-chromium.sh
index e43a2fd..0f14f9e 100755
--- 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
index 47d6797..ae2e4c3 100755
--- 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
index eec0c2b..ffdb71a 100755
--- 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."
From e7899435fefda2841a54dff7a58568eaba67cf02 Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 06:20:39 +0000
Subject: [PATCH 3/6] Open logger/dashboard links adjacent to current tab
This regressed in https://github.com/gorhill/uMatrix/commit/9b29230.
---
src/js/popup.js | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/js/popup.js b/src/js/popup.js
index b4d8e3f..88239dc 100644
--- 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();
From 954d827934f477ba69084ca78ff52f17040df76e Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 07:04:51 +0000
Subject: [PATCH 4/6] Allow line breaking for long domains in popup panel
---
src/css/popup.css | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/css/popup.css b/src/css/popup.css
index bdf3309..be6ccbd 100644
--- 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;
From 7562a3d6975519f6c3bd642e70bc08c64610df53 Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 07:08:21 +0000
Subject: [PATCH 5/6] Add missing styling for `fa-icon-vflipped` class
Fixes the search widget down arrow's direction in asset viewer.
---
src/css/fa-icons.css | 3 +++
1 file changed, 3 insertions(+)
diff --git a/src/css/fa-icons.css b/src/css/fa-icons.css
index c195292..1974879 100644
--- 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;
From bda7383bc8c2f8c7dde456fe836cc27564c3b43d Mon Sep 17 00:00:00 2001
From: xofe <22776566+xofe@users.noreply.github.com>
Date: Fri, 14 Aug 2020 14:17:01 +0000
Subject: [PATCH 6/6] Fix tooltip for "obsolete" icon in dashboard assets page
---
src/hosts-files.html | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/hosts-files.html b/src/hosts-files.html
index bb8329c..a707435 100644
--- a/src/hosts-files.html
+++ b/src/hosts-files.html
@@ -55,7 +55,7 @@
-->info-circleunlockexclamation-triangleexclamation-triangleclockspinnerunlink