Skip to content
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

Add wildcard origin matching and manual reply function binding #7

Merged
merged 10 commits into from
Nov 30, 2011
Merged

Add wildcard origin matching and manual reply function binding #7

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f0f86f2
* now allows wildcard responses. Fixed #6
jonhoo Sep 26, 2011
2bfef35
New function pm.bind_c for binding a function with manual reply sendi…
jonhoo Sep 26, 2011
e77ed32
Typo (om => pm)
jonhoo Sep 26, 2011
4327483
Factored out common code from pm.bind and pm.bind_c into pm._replyBind
jonhoo Sep 26, 2011
e6b3674
Bound callbacks now also receive the incoming event should they requi…
jonhoo Sep 27, 2011
74619a6
Prevent postmessage from trapping exceptions. Fixes #9
jonhoo Sep 30, 2011
38e3928
Merged upstream
jonhoo Nov 10, 2011
1989f6f
Changed bind_c to bind with an extra parameter as per daeparks request
jonhoo Nov 10, 2011
c7deb35
Revert "Prevent postmessage from trapping exceptions. Fixes #9"
jonhoo Nov 10, 2011
881a6cd
Rethrow exceptions for a better resolution to #9
jonhoo Nov 10, 2011
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
76 changes: 50 additions & 26 deletions postmessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,8 @@ var NO_JQUERY = {};
};

// bind postmessage handler
$.pm.bind = window.pm.bind = function(type, fn, origin, hash) {
pm.bind(type, fn, origin, hash);
$.pm.bind = window.pm.bind = function(type, fn, origin, hash, async_reply) {
pm.bind(type, fn, origin, hash, async_reply === true);
};

// unbind postmessage handler
Expand Down Expand Up @@ -102,24 +102,28 @@ var NO_JQUERY = {};
}
},

bind: function(type, fn, origin, hash) {
if (("postMessage" in window) && !hash) {
pm._bind();
}
else {
pm.hash._bind();
}
var l = pm.data("listeners.postmessage");
if (!l) {
l = {};
pm.data("listeners.postmessage", l);
}
var fns = l[type];
if (!fns) {
fns = [];
l[type] = fns;
}
fns.push({fn:fn, origin:origin || $.pm.origin});
bind: function(type, fn, origin, hash, async_reply) {
pm._replyBind ( type, fn, origin, hash, async_reply );
},

_replyBind: function(type, fn, origin, hash, isCallback) {
if (("postMessage" in window) && !hash) {
pm._bind();
}
else {
pm.hash._bind();
}
var l = pm.data("listeners.postmessage");
if (!l) {
l = {};
pm.data("listeners.postmessage", l);
}
var fns = l[type];
if (!fns) {
fns = [];
l[type] = fns;
}
fns.push({fn:fn, callback: isCallback, origin:origin || $.pm.origin});
},

unbind: function(type, fn) {
Expand Down Expand Up @@ -233,16 +237,26 @@ var NO_JQUERY = {};
}
continue;
}

function sendReply ( data ) {
if (msg.callback) {
pm.send({target:e.source, data:data, type:msg.callback});
}
}

try {
var r = o.fn(msg.data);
if (msg.callback) {
pm.send({target:e.source, data:r, type:msg.callback});
if ( o.callback ) {
o.fn(msg.data, sendReply, e);
} else {
sendReply ( o.fn(msg.data, e) );
}
}
catch (ex) {
if (msg.errback) {
// notify post message errback
pm.send({target:e.source, data:ex, type:msg.errback});
} else {
throw ex;
}
}
};
Expand Down Expand Up @@ -370,16 +384,26 @@ var NO_JQUERY = {};
continue;
}
}

function sendReply ( data ) {
if (msg.callback) {
pm.send({target:source_window, data:data, type:msg.callback, hash:true, url:hash.source.url});
}
}

try {
var r = o.fn(msg.data);
if (msg.callback) {
pm.send({target:source_window, data:r, type:msg.callback, hash:true, url:hash.source.url});
if ( o.callback ) {
o.fn(msg.data, sendReply);
} else {
sendReply ( o.fn(msg.data) );
}
}
catch (ex) {
if (msg.errback) {
// notify post message errback
pm.send({target:source_window, data:ex, type:msg.errback, hash:true, url:hash.source.url});
} else {
throw ex;
}
}
};
Expand Down