Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

fix for getOrigin issue within iFrames #136 #175

Merged
merged 2 commits into from
Jun 19, 2019
Merged

fix for getOrigin issue within iFrames #136 #175

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a686d8
fix:#136
zlyfenek May 22, 2019
5eeef14
destructuring
zlyfenek May 30, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,17 @@ export function getWindowHeight() {
// Get the highest window context that isn't cross-origin
// (When in an iframe)
export function getHighestSafeWindowContext(self = global.window.self) {
const referrer = self.document.referrer;
// If we reached the top level, return self
if (self === global.window.top) {
if (self === global.window.top || !referrer) {
return self;
}

const getOrigin = href => href.match(/(.*\/\/.*?)(\/|$)/)[1];

// If parent is the same origin, we can move up one context
// Reference: https://stackoverflow.com/a/21965342/1601953
if (getOrigin(self.location.href) === getOrigin(self.document.referrer)) {
if (getOrigin(self.location.href) === getOrigin(referrer)) {
return getHighestSafeWindowContext(self.parent);
}

Expand Down