Skip to content

Resolve 'frame is null' errors #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
kennethkufluk wants to merge 1 commit into from
Closed

Resolve 'frame is null' errors #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 26 additions & 21 deletions xdm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,6 +509,30 @@
}
}

/**
* This adds the listener for messages when the frame is ready.
* @private
* @param {Object} event The messageevent
*/
function _waitForReady(event) {
if (event.data === config.channel + '-ready') {
if ('postMessage' in frame.contentWindow) {
callerWindow = frame.contentWindow;
}
else {
callerWindow = frame.contentWindow.document;
}

// replace the eventlistener
removeEvent(window, 'message', _waitForReady);
addEvent(window, 'message', _windowOnMessage);

setTimeout(function () {
pub.up.callback(true);
}, 0);
}
};

pub = {
outgoing: function (message, domain, fn) {
callerWindow.postMessage(config.channel + ' ' + message, domain || targetOrigin);
Expand All @@ -518,6 +542,7 @@
},

destroy: function () {
removeEvent(window, 'message', _waitForReady);
removeEvent(window, 'message', _windowOnMessage);
if (frame) {
callerWindow = null;
Expand All @@ -529,27 +554,7 @@
init: function () {
targetOrigin = getLocation(config.remote);
if (config.isHost) {
// add the event handler for listening
var waitForReady = function (event) {
if (event.data === config.channel + '-ready') {
if ('postMessage' in frame.contentWindow) {
callerWindow = frame.contentWindow;
}
else {
callerWindow = frame.contentWindow.document;
}

// replace the eventlistener
removeEvent(window, 'message', waitForReady);
addEvent(window, 'message', _windowOnMessage);

setTimeout(function () {
pub.up.callback(true);
}, 0);
}
};

addEvent(window, 'message', waitForReady);
addEvent(window, 'message', _waitForReady);
frame = createFrame(config);
}
else {
Expand Down