This commit is contained in:
foudfou 2012-02-09 15:58:59 +01:00
parent 6daf73fe44
commit ba674bf1e1
2 changed files with 10 additions and 13 deletions

View File

@ -12,7 +12,7 @@ Cu.import("resource://firetray/ctypes/linux/gobject.jsm");
Cu.import("resource://firetray/ctypes/linux/gtk.jsm"); Cu.import("resource://firetray/ctypes/linux/gtk.jsm");
Cu.import("resource://firetray/commons.js"); Cu.import("resource://firetray/commons.js");
Cu.import("resource://firetray/PrefListener.jsm"); Cu.import("resource://firetray/PrefListener.jsm");
Cu.import("resource://firetray/FiretrayVersionChange.jsm"); Cu.import("resource://firetray/VersionChange.jsm");
/** /**
* firetray namespace. * firetray namespace.
@ -100,18 +100,14 @@ firetray.Handler = {
Services.obs.addObserver(this, this.getAppStartupTopic(this.appId), false); Services.obs.addObserver(this, this.getAppStartupTopic(this.appId), false);
Services.obs.addObserver(this, "xpcom-will-shutdown", false); Services.obs.addObserver(this, "xpcom-will-shutdown", false);
firetray.VersionChange.setInstallHook(function(ver) { let welcome = function(ver) {
firetray.Handler.openTab(FIRETRAY_SPLASH_PAGE+"#"+ver); firetray.Handler.openTab(FIRETRAY_SPLASH_PAGE+"#"+ver);
firetray.Handler.tryEraseOldOptions(); firetray.Handler.tryEraseOldOptions();
}); };
firetray.VersionChange.setUpgradeHook(function(ver) { VersionChange.setInstallHook(welcome);
firetray.Handler.openTab(FIRETRAY_SPLASH_PAGE+"#"+ver); VersionChange.setUpgradeHook(welcome);
firetray.Handler.tryEraseOldOptions(); VersionChange.setReinstallHook(welcome);
}); VersionChange.watch();
firetray.VersionChange.setReinstallHook(function(ver) {
firetray.Handler.openTab(FIRETRAY_SPLASH_PAGE+"#"+ver);
});
firetray.VersionChange.watch();
this.initialized = true; this.initialized = true;
return true; return true;

View File

@ -1,4 +1,4 @@
var EXPORTED_SYMBOLS = [ "firetray" ]; var EXPORTED_SYMBOLS = [ "VersionChange" ];
const Cc = Components.classes; const Cc = Components.classes;
const Ci = Components.interfaces; const Ci = Components.interfaces;
@ -13,7 +13,8 @@ Cu.import("resource://firetray/commons.js");
* use setInstallHook(), setUpgradeHook(), setReinstallHook() * use setInstallHook(), setUpgradeHook(), setReinstallHook()
* http://mike.kaply.com/2011/02/02/running-add-on-code-at-first-run-and-upgrade/ * http://mike.kaply.com/2011/02/02/running-add-on-code-at-first-run-and-upgrade/
*/ */
firetray.VersionChange = { var VersionChange = {
curVersion: null, curVersion: null,
versionComparator: Cc["@mozilla.org/xpcom/version-comparator;1"] versionComparator: Cc["@mozilla.org/xpcom/version-comparator;1"]