diff options
author | Alex Xu <alex_y_xu@yahoo.ca> | 2014-12-07 09:38:55 -0500 |
---|---|---|
committer | Alex Xu <alex_y_xu@yahoo.ca> | 2014-12-07 09:38:55 -0500 |
commit | 9d43f129d4ad56dded752aa75c4dd2bb5af48b9e (patch) | |
tree | 7c0e9dd7ef78eb2b122f383fc9d0c10591e76194 /src/bootstrap.js | |
parent | 2c30652840889cd2e1c5e15574e93aefdb720fcf (diff) | |
download | eib-9d43f129d4ad56dded752aa75c4dd2bb5af48b9e.tar.xz eib-9d43f129d4ad56dded752aa75c4dd2bb5af48b9e.zip |
Fix stuff.
Diffstat (limited to 'src/bootstrap.js')
-rw-r--r-- | src/bootstrap.js | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/bootstrap.js b/src/bootstrap.js index 2625c92..b01697f 100644 --- a/src/bootstrap.js +++ b/src/bootstrap.js @@ -103,12 +103,13 @@ var WindowListener = { } window.addEventListener("load", onWindowLoad); }, - onCloseWindow: function(xulWindow) {}, - onWindowTitleChange: function(xulWindow, newTitle) {} }; var TrustedReparser = { observe: function () { + if (!EIB.prefs.prefHasUserValue("trusted")) { + EIB.prefs.setCharPref("trusted", "[]"); + } EIB.trusted = JSON.parse(EIB.prefs.getCharPref("trusted")); } }; @@ -118,7 +119,7 @@ function startup(data, reason) { EIB.prefs = Services.prefs.getBranch("extensions.eib."); EIB.prefs.addObserver("trusted", TrustedReparser, false); - reparseTrusted(); + TrustedReparser.observe(); forEachOpenWindow(loadIntoWindow); Services.wm.addListener(WindowListener); @@ -154,10 +155,12 @@ function injectCCPEVE(e) { if (checkTrusted(window.location.href)) { var CCPEVE = Cu.createObjectIn(window, {defineAs: "CCPEVE"}); ["openEveMail", "showInfo", "showPreview", "showRouteTo", "showMap", "showFitting", "showContract", "showMarketDetails", "setDestination", "addWaypoint", "joinChannel", "joinMailingList", "createContract", "buyType", "findInContracts", "addToMarketQuickBar", "addContact", "removeContact", "addCorpContact", "removeCorpContact", "block", "addBounty", "inviteToFleet", "startConversation", "showContracts", "showOnMap", "editMember", "awardDecoration", "sendMail", "showContents", "bookmark"].forEach(function (n) { - Cu.exportFunction(function () { - EIB.pending.push('CCPEVE.' + n + '(' + Array.prototype.join.call(arguments, ',') + ');'); - return null; - }, CCPEVE, {defineAs: n}); + Object.defineProperty(CCPEVE, n, { + value: Cu.exportFunction(function () { + EIB.pending.push('CCPEVE.' + n + '(' + Array.prototype.join.call(arguments, ',') + ');'); + return null; + }, CCPEVE) + }); }); } } |