From dff4afde44f4475f34107137a75767aa3a2fe2a3 Mon Sep 17 00:00:00 2001 From: Alexandre Poirot Date: Wed, 21 Jan 2015 21:07:45 -0800 Subject: [PATCH] Bug 1118544 - Tweak WebIDE to better support FxOS addons. r=jryans --- browser/devtools/app-manager/app-validator.js | 4 ++++ browser/devtools/webide/modules/app-manager.js | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/browser/devtools/app-manager/app-validator.js b/browser/devtools/app-manager/app-validator.js index b60ac71dcc9f..f8b05c7464a2 100644 --- a/browser/devtools/app-manager/app-validator.js +++ b/browser/devtools/app-manager/app-validator.js @@ -190,6 +190,10 @@ AppValidator.prototype._getOriginURL = function () { }; AppValidator.prototype.validateLaunchPath = function (manifest) { + // Addons don't use index page (yet?) + if (manifest.role && manifest.role === "addon") { + return promise.resolve(); + } let deferred = promise.defer(); // The launch_path field has to start with a `/` if (manifest.launch_path && manifest.launch_path[0] !== "/") { diff --git a/browser/devtools/webide/modules/app-manager.js b/browser/devtools/webide/modules/app-manager.js index 7819c17e3e6b..d734a1ec232e 100644 --- a/browser/devtools/webide/modules/app-manager.js +++ b/browser/devtools/webide/modules/app-manager.js @@ -510,6 +510,12 @@ let AppManager = exports.AppManager = { project.manifest); } + // Addons don't have any document to load (yet?) + // So that there is no need to run them, installing is enough + if (project.manifest.role && project.manifest.role === "addon") { + return; + } + let {app} = response; if (!app.running) { let deferred = promise.defer();