diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-05-01 09:55:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-01 09:55:22 +0200 |
| commit | 92c59fe35046f3935cb812d6c866b3adeb7e8c69 (patch) | |
| tree | 8399c886c179711c383eabae1541e3fb13922fed /application/palemoon/base/content | |
| parent | 62931346527d1ede4393db88033f77abb2489ce5 (diff) | |
| parent | 1b50c57865c8bc11f9d6a196dc7474de0620791e (diff) | |
| download | UXP-92c59fe35046f3935cb812d6c866b3adeb7e8c69.tar UXP-92c59fe35046f3935cb812d6c866b3adeb7e8c69.tar.gz UXP-92c59fe35046f3935cb812d6c866b3adeb7e8c69.tar.lz UXP-92c59fe35046f3935cb812d6c866b3adeb7e8c69.tar.xz UXP-92c59fe35046f3935cb812d6c866b3adeb7e8c69.zip | |
Merge pull request #306 from JustOff/PR_owner_triggeringPrincipal
[PALEMOON] Replace `owner` with `triggeringPrincipal` to match the updated API
Diffstat (limited to 'application/palemoon/base/content')
| -rw-r--r-- | application/palemoon/base/content/openLocation.js | 2 | ||||
| -rw-r--r-- | application/palemoon/base/content/urlbarBindings.xml | 4 | ||||
| -rw-r--r-- | application/palemoon/base/content/utilityOverlay.js | 2 |
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; } |