Bug 985094 - Show typeName from protocol.js in listTabs reply. r=past
--- a/toolkit/devtools/server/main.js
+++ b/toolkit/devtools/server/main.js
@@ -798,17 +798,18 @@ ActorPool.prototype = {
* 'disconnect' property, it will be called when the actor
* pool is cleaned up.
*/
addActor: function AP_addActor(aActor) {
aActor.conn = this.conn;
if (!aActor.actorID) {
let prefix = aActor.actorPrefix;
if (typeof aActor == "function") {
- prefix = aActor.prototype.actorPrefix;
+ // typeName is a convention used with protocol.js-based actors
+ prefix = aActor.prototype.actorPrefix || aActor.prototype.typeName;
}
aActor.actorID = this.conn.allocID(prefix || undefined);
}
if (aActor.registeredPool) {
aActor.registeredPool.removeActor(aActor);
}
aActor.registeredPool = this;