summaryrefslogtreecommitdiffstats
path: root/application/palemoon/base
diff options
context:
space:
mode:
authorJustOff <Off.Just.Off@gmail.com>2018-04-30 17:24:47 +0300
committerJustOff <Off.Just.Off@gmail.com>2018-04-30 17:24:47 +0300
commit6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7 (patch)
tree04942010182f6521bdc5bcb2c660326d22ea2711 /application/palemoon/base
parentfefce8f7ccbc476cfc46e61b01eff069346d3c73 (diff)
downloadUXP-6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7.tar
UXP-6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7.tar.gz
UXP-6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7.tar.lz
UXP-6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7.tar.xz
UXP-6bca91e94001bdc8cbdc3ce553f6951dbcb0cbd7.zip
[PALEMOON] Replace `owner` with `triggeringPrincipal` to match the updated UXP docshell
Diffstat (limited to 'application/palemoon/base')
-rw-r--r--application/palemoon/base/content/openLocation.js2
-rw-r--r--application/palemoon/base/content/urlbarBindings.xml4
-rw-r--r--application/palemoon/base/content/utilityOverlay.js2
3 files changed, 4 insertions, 4 deletions
diff --git a/application/palemoon/base/content/openLocation.js b/application/palemoon/base/content/openLocation.js
index 1a10334c7..f39e34666 100644
--- a/application/palemoon/base/content/openLocation.js
+++ b/application/palemoon/base/content/openLocation.js
@@ -83,7 +83,7 @@ function open()
var flags = webNav.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP |
webNav.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
if (!mayInheritPrincipal)
- flags |= webNav.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+ flags |= webNav.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
browser.gBrowser.loadURIWithFlags(url, flags, null, null, postData);
break;
case "1":
diff --git a/application/palemoon/base/content/urlbarBindings.xml b/application/palemoon/base/content/urlbarBindings.xml
index 985769ec2..d188e6658 100644
--- a/application/palemoon/base/content/urlbarBindings.xml
+++ b/application/palemoon/base/content/urlbarBindings.xml
@@ -305,12 +305,12 @@
function loadCurrent() {
let flags = Ci.nsIWebNavigation.LOAD_FLAGS_ALLOW_THIRD_PARTY_FIXUP;
- // Pass LOAD_FLAGS_DISALLOW_INHERIT_OWNER to prevent any loads from
+ // Pass LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL to prevent any loads from
// inheriting the currently loaded document's principal, unless this
// URL is marked as safe to inherit (e.g. came from a bookmark
// keyword).
if (!mayInheritPrincipal)
- flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+ flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
// If the value wasn't typed, we know that we decoded the value as
// UTF-8 (see losslessDecodeURI)
if (!this.valueIsTyped)
diff --git a/application/palemoon/base/content/utilityOverlay.js b/application/palemoon/base/content/utilityOverlay.js
index 9763891ba..633cb8853 100644
--- a/application/palemoon/base/content/utilityOverlay.js
+++ b/application/palemoon/base/content/utilityOverlay.js
@@ -333,7 +333,7 @@ function openLinkIn(url, where, params) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FIXUP_SCHEME_TYPOS;
}
if (aDisallowInheritPrincipal)
- flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_OWNER;
+ flags |= Ci.nsIWebNavigation.LOAD_FLAGS_DISALLOW_INHERIT_PRINCIPAL;
if (aForceAllowDataURI) {
flags |= Ci.nsIWebNavigation.LOAD_FLAGS_FORCE_ALLOW_DATA_URI;
}