infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Call the handler if onReady is called for a ready channel

pull/1/head
yflory 2017-12-11 12:48:06 +01:00
parent dcfccf88cd
commit 89cc583f53
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
www/common/common-ui-elements.js
View File

@ -1231,7 +1231,7 @@ define([
expireVal = ($('#cp-creation-expire-val').val() || 0) * unit;
}
// TODO remove these lines
// XXX TODO remove these lines
ownedVal = undefined;
expire = undefined;
@ -1240,7 +1240,7 @@ define([
expire: expireVal,
template: template
}, function () {
$creation.remove();
$creationContainer.remove();
cb();
});
};

6
www/common/sframe-channel.js
View File

@ -110,9 +110,13 @@ define([
chan.whenReg('EV_REGISTER_HANDLER', evReady.fire);
// Make sure both iframes are ready
var isReady =false;
chan.onReady = function (h) {
if (isReady) {
return void h();
}
if (typeof(h) !== "function") { return; }
chan.on('EV_RPC_READY', function () { h(); });
chan.on('EV_RPC_READY', function () { isReady = true; h(); });
};
chan.ready = function () {
chan.whenReg('EV_RPC_READY', function () {