Commit 1da1d7bb authored by Romain Courteaud's avatar Romain Courteaud

Wait for all method declarations before marking the gadget ready.

parent acd9abbf
...@@ -139,24 +139,80 @@ ...@@ -139,24 +139,80 @@
// Class inheritance // Class inheritance
function RenderJSEmbeddedGadget() { function RenderJSEmbeddedGadget() {
var root_gadget = this,
declare_method_count = 0,
gadget_ready = false,
// Create the communication channel
embedded_channel = Channel.build({
window: window.parent,
origin: "*",
scope: "renderJS"
});
RenderJSGadget.call(this); RenderJSGadget.call(this);
// Bind calls to renderJS method on the instance
embedded_channel.bind("methodCall", function (trans, v) {
root_gadget[v[0]].apply(root_gadget, v[1]).done(function (g) {
trans.complete(g);
}).fail(function () {
trans.error(Array.prototype.slice.call(arguments, 0));
});
trans.delayReturn(true);
});
// Notify parent about gadget instanciation
function notifyReady() {
if ((declare_method_count === 0) && (gadget_ready === true)) {
embedded_channel.notify({method: "ready"});
} }
RenderJSEmbeddedGadget.ready_list = []; }
RenderJSEmbeddedGadget.declareMethod =
RenderJSGadget.declareMethod; // Inform parent gadget about declareMethod calls here.
RenderJSEmbeddedGadget.ready = function notifyDeclareMethod(name) {
RenderJSGadget.ready; declare_method_count += 1;
RenderJSEmbeddedGadget.prototype = new RenderJSGadget(); embedded_channel.call({
RenderJSEmbeddedGadget.prototype.constructor = RenderJSEmbeddedGadget;
// XXX Declare method in same non root url gadget
RenderJSEmbeddedGadget.declareMethod = function (name, callback) {
RenderJSEmbeddedGadget.root_gadget.chan.notify({
method: "declareMethod", method: "declareMethod",
params: name, params: name,
success: function () {
declare_method_count -= 1;
notifyReady();
},
error: function () {
declare_method_count -= 1;
// console.error(Array.prototype.slice.call(arguments, 0));
},
}); });
}
notifyDeclareMethod("getInterfaceList");
notifyDeclareMethod("getRequiredCSSList");
notifyDeclareMethod("getRequiredJSList");
notifyDeclareMethod("getPath");
notifyDeclareMethod("getTitle");
notifyDeclareMethod("getHTML");
// Surcharge declareMethod to inform parent window
this.constructor.declareMethod = function (name, callback) {
notifyDeclareMethod(name);
return RenderJSGadget.declareMethod.apply(this, [name, callback]); return RenderJSGadget.declareMethod.apply(this, [name, callback]);
}; };
// Inform parent window that gadget is correctly loaded
loading_gadget_promise.done(function () {
gadget_ready = true;
notifyReady();
}).fail(function () {
embedded_channel.notify({method: "failed"});
});
return root_gadget;
}
RenderJSEmbeddedGadget.ready_list = [];
RenderJSEmbeddedGadget.ready =
RenderJSGadget.ready;
RenderJSEmbeddedGadget.prototype = new RenderJSGadget();
RenderJSEmbeddedGadget.prototype.constructor = RenderJSEmbeddedGadget;
// Class inheritance // Class inheritance
function RenderJSIframeGadget() { function RenderJSIframeGadget() {
RenderJSGadget.call(this); RenderJSGadget.call(this);
...@@ -222,19 +278,25 @@ ...@@ -222,19 +278,25 @@
Array.prototype.slice.call(arguments, 0)], Array.prototype.slice.call(arguments, 0)],
success: function () { success: function () {
dfr.resolveWith(gadget, arguments); dfr.resolveWith(gadget, arguments);
},
error: function () {
dfr.rejectWith(gadget, arguments);
} }
// XXX Error callback // XXX Error callback
}); });
return dfr.promise(); return dfr.promise();
}; };
return "OK";
}); });
// Wait for the iframe to be loaded before continuing // Wait for the iframe to be loaded before continuing
gadget.chan.bind("ready", function (trans) { gadget.chan.bind("ready", function (trans) {
next_loading_gadget_deferred.resolve(gadget); next_loading_gadget_deferred.resolve(gadget);
return "OK";
}); });
gadget.chan.bind("failed", function (trans) { gadget.chan.bind("failed", function (trans) {
next_loading_gadget_deferred.reject(); next_loading_gadget_deferred.reject();
return "OK";
}); });
} else { } else {
next_loading_gadget_deferred.reject(); next_loading_gadget_deferred.reject();
...@@ -310,6 +372,7 @@ ...@@ -310,6 +372,7 @@
// Dependency correctly loaded. Fire instanciation success. // Dependency correctly loaded. Fire instanciation success.
next_loading_gadget_deferred.resolve(gadget); next_loading_gadget_deferred.resolve(gadget);
}).fail(function () { }).fail(function () {
// console.error(Array.prototype.slice.call(arguments, 0));
// One error during css/js loading // One error during css/js loading
next_loading_gadget_deferred.reject.apply( next_loading_gadget_deferred.reject.apply(
next_loading_gadget_deferred, next_loading_gadget_deferred,
...@@ -467,7 +530,6 @@ ...@@ -467,7 +530,6 @@
result = selector; result = selector;
} }
if (result === undefined) { if (result === undefined) {
console.error(selector);
throw new Error("Unknown selector '" + selector + "'"); throw new Error("Unknown selector '" + selector + "'");
} }
return result; return result;
...@@ -500,6 +562,8 @@ ...@@ -500,6 +562,8 @@
cache: true, cache: true,
}).done(function (script, textStatus) { }).done(function (script, textStatus) {
javascript_registration_dict[url] = null; javascript_registration_dict[url] = null;
// }).fail(function () {
// console.error(Array.prototype.slice.call(arguments, 0));
}); });
} }
...@@ -684,58 +748,6 @@ ...@@ -684,58 +748,6 @@
// Create the root gadget instance and put it in the loading stack // Create the root gadget instance and put it in the loading stack
tmp_constructor = RenderJSEmbeddedGadget; tmp_constructor = RenderJSEmbeddedGadget;
root_gadget = new RenderJSEmbeddedGadget(); root_gadget = new RenderJSEmbeddedGadget();
RenderJSEmbeddedGadget.root_gadget = root_gadget;
// Create the communication channel
root_gadget.chan = Channel.build({
window: window.parent,
origin: "*",
scope: "renderJS"
});
root_gadget.chan.bind("methodCall", function (trans, v) {
root_gadget[v[0]].apply(root_gadget, v[1]).done(function (g) {
trans.complete(g);
});
trans.delayReturn(true);
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getInterfaceList",
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getRequiredCSSList",
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getRequiredJSList",
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getPath",
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getTitle",
});
root_gadget.chan.notify({
method: "declareMethod",
params: "getHTML",
});
// Surcharge declareMethod to inform parent window
// XXX TODO
// Inform parent window that gadget is correctly loaded
loading_gadget_promise.done(function () {
// XXX Wait for all previous declaration before ending ready message
setTimeout(function () {
root_gadget.chan.notify({method: "ready"});
}, 100);
}).fail(function () {
root_gadget.chan.notify({method: "failed"});
});
} }
gadget_loading_klass = tmp_constructor; gadget_loading_klass = tmp_constructor;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment