summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 12:30:42 +0200
committerjanekptacijarabaci <janekptacijarabaci@seznam.cz>2018-04-26 12:30:42 +0200
commitdbfedf8462c6db4647ad7e072f3875c9a4124c6a (patch)
tree0d73a84c85f2f90950ce543685712403b1b9fc4b
parent0638a11fc4ac96d6f56e0038d140b32906fa5d82 (diff)
downloadUXP-dbfedf8462c6db4647ad7e072f3875c9a4124c6a.tar
UXP-dbfedf8462c6db4647ad7e072f3875c9a4124c6a.tar.gz
UXP-dbfedf8462c6db4647ad7e072f3875c9a4124c6a.tar.lz
UXP-dbfedf8462c6db4647ad7e072f3875c9a4124c6a.tar.xz
UXP-dbfedf8462c6db4647ad7e072f3875c9a4124c6a.zip
Bug 1173523 - Part 9: Update pageinfo to use the new API for nsIPermission
-rw-r--r--application/palemoon/base/content/pageinfo/pageInfo.js3
-rw-r--r--application/palemoon/base/content/pageinfo/permissions.js4
2 files changed, 4 insertions, 3 deletions
diff --git a/application/palemoon/base/content/pageinfo/pageInfo.js b/application/palemoon/base/content/pageinfo/pageInfo.js
index 83f0ddb91..6b02bc370 100644
--- a/application/palemoon/base/content/pageinfo/pageInfo.js
+++ b/application/palemoon/base/content/pageinfo/pageInfo.js
@@ -1112,8 +1112,9 @@ var imagePermissionObserver = {
var row = getSelectedRow(imageTree);
var item = gImageView.data[row][COL_IMAGE_NODE];
var url = gImageView.data[row][COL_IMAGE_ADDRESS];
- if (makeURI(url).host == permission.host)
+ if (permission.matchesURI(makeURI(url), true)) {
makeBlockImage(url);
+ }
}
}
}
diff --git a/application/palemoon/base/content/pageinfo/permissions.js b/application/palemoon/base/content/pageinfo/permissions.js
index 2fa0cc303..68261ce6e 100644
--- a/application/palemoon/base/content/pageinfo/permissions.js
+++ b/application/palemoon/base/content/pageinfo/permissions.js
@@ -98,7 +98,7 @@ var permissionObserver = {
if (aTopic == "perm-changed") {
var permission = aSubject.QueryInterface(
Components.interfaces.nsIPermission);
- if (permission.host == gPermURI.host) {
+ if (permission.matchesURI(gPermURI, true)) {
if (permission.type in gPermObj)
initRow(permission.type);
else if (permission.type.startsWith("plugin"))
@@ -119,7 +119,7 @@ function onLoadPermission(principal)
gPermURI = uri;
gPermPrincipal = principal;
var hostText = document.getElementById("hostText");
- hostText.value = gPermURI.host;
+ hostText.value = gPermURI.prePath;
for (var i in gPermObj)
initRow(i);