0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

keep parent and iframe from sending init messages indefinitely

Browse source
This commit is contained in:
rlx 2014-09-26 11:29:14 +02:00
parent 4b84424869
commit 5424023903
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
source/Ox.UI/js/Core/Element.js
View file

@ -133,7 +133,10 @@
if (that.attr('src')) { if (that.attr('src')) {
// send oxid to iframe // send oxid to iframe
that.postMessage({init: {oxid: that.oxid}}); that.postMessage({init: {oxid: that.oxid}});
self.initTimeout = setTimeout(init, 250); self.initTime = self.initTime || new Date();
if (new Date() < self.initTime + 60000) {
self.initTimeout = setTimeout(init, 250);
}
} }
} }
}).bindEvent({ }).bindEvent({

9
source/Ox.UI/js/Core/Event.js
View file

@ -222,9 +222,12 @@
// There actually is an outer window // There actually is an outer window
if (!Ox.oxid) { if (!Ox.oxid) {
// Inner window has not received init message yet // Inner window has not received init message yet
setTimeout(function() { self.initTime = self.initTime || new Date();
that.postMessage.apply(that, arguments); if (new Date() < self.initTime + 60000) {
}, 250); setTimeout(function() {
that.postMessage.apply(that, arguments);
}, 250);
}
} else { } else {
return Ox.Message.post.apply(this, arguments); return Ox.Message.post.apply(this, arguments);
} }