Skip to content
This repository has been archived by the owner on Feb 26, 2022. It is now read-only.

Commit

Permalink
Revert "Merge pull request #1182 from erikvold/865391"
Browse files Browse the repository at this point in the history
This reverts commit 1ab0df2, reversing
changes made to bd177f2.
  • Loading branch information
KWierso committed Aug 26, 2013
1 parent 2e78984 commit f29d2bb
Showing 1 changed file with 2 additions and 13 deletions.
15 changes: 2 additions & 13 deletions lib/sdk/addon/runner.js
Expand Up @@ -13,7 +13,6 @@ const { exit, env, staticArgs } = require('../system');
const { when: unload } = require('../system/unload');
const { loadReason } = require('../self');
const { rootURI } = require("@loader/options");
const cfxArgs = require("@test/options");
const globals = require('../system/globals');
const xulApp = require('../system/xul-app');
const appShellService = Cc['@mozilla.org/appshell/appShellService;1'].
Expand Down Expand Up @@ -102,11 +101,7 @@ function startup(reason, options) {
// Run the addon even in case of error (best effort approach)
require('../l10n/loader').
load(rootURI).
then(function l10nSuccess() {
if (cfxArgs.parseable) {
console.info("localization information has loaded successfully.");
}
}, function l10nFailure(error) {
then(null, function failure(error) {
console.info("Error while loading localization: " + error.message);
}).
then(function onLocalizationReady(data) {
Expand All @@ -115,10 +110,6 @@ function startup(reason, options) {
definePseudo(options.loader, '@l10n/data', data ? data : null);
return ready;
}).then(function() {
if (cfxArgs.parseable) {
console.info("addon window has loaded successfully.");
}

run(options);
}).then(null, console.exception);
}
Expand All @@ -137,7 +128,6 @@ function run(options) {
catch(error) {
console.exception(error);
}

// Initialize inline options localization, without preventing addon to be
// run in case of error
try {
Expand Down Expand Up @@ -167,8 +157,7 @@ function run(options) {
quit: exit
});
}
}
catch (error) {
} catch (error) {
console.exception(error);
throw error;
}
Expand Down

0 comments on commit f29d2bb

Please sign in to comment.