Changeset 99ced4

Timestamp:

Nov 23, 2011, 11:40:21 AM (11 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

f29419

Parents:

c9f1d7

Message:

moved upgrade-code to general overlay

Files:

• chrome.manifest (modified) (1 diff)
• content/vI_overlay.js (modified) (1 diff)
• content/vI_overlay.xul (modified) (1 diff)
• content/vI_upgrade.js (modified) (1 diff)
• content/vI_upgradeOverlay.js (deleted)
• content/vI_upgradeOverlay.xul (deleted)

chrome.manifest

@@ -13 +13 @@
 overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_overlay.xul
 overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_context.xul
-overlay chrome://messenger/content/messenger.xul                chrome://v_identity/content/vI_upgradeOverlay.xul
 
 overlay chrome://messenger/content/messengercompose/messengercompose.xul    chrome://v_identity/content/v_identity.xul

content/vI_overlay.js

@@ +1 @@
+  /* ***** BEGIN LICENSE BLOCK *****
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    The Original Code is the Virtual Identity Extension.
+
+    The Initial Developer of the Original Code is Rene Ejury.
+    Portions created by the Initial Developer are Copyright (C) 2011
+    the Initial Developer. All Rights Reserved.
+
+    Contributor(s): 
+ * ***** END LICENSE BLOCK ***** */
 
 Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
+  
+let Log = vI.setupLogging("virtualIdentity.overlay");
+
+Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
+Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
+Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension);
+
+Components.utils.import("resource://gre/modules/AddonManager.jsm");  
+
+const virtualIdentity_ID="{dddd428e-5ac8-4a81-9f78-276c734f75b8}"
+AddonManager.getAddonByID(virtualIdentity_ID, function(addon) {
+  if (addon)
+    vI.extensionVersion = addon.version;
+});
+
+
+function extensionInit() {
+  Log.debug("init")
+    var rdfDatasource = new vI.rdfDatasource("virtualIdentity.rdf", true);
+    if (rdfDatasource.extUpgradeRequired()) {
+        Log.debug("extension upgrade required")
+        if (!vI.upgrade.quick_upgrade(rdfDatasource.getCurrentExtFileVersion())) {
+            Log.debug("opening extension upgrade window")
+            window.open("chrome://v_identity/content/vI_upgrade.xul",0,
+                "chrome, dialog, modal, alwaysRaised, resizable=yes").focus();
+        }
+    }
+    else {
+        vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories
+        rdfDatasource.storeExtVersion();
+    }
+    rdfDatasource.refreshAccountInfo();
+    rdfDatasource.clean();
+    
+    if (vI.vIprefs.get("error_console")) {
+        document.getElementById("virtualIdentityExtension_vIErrorBoxSplitter").removeAttribute("hidden");
+        document.getElementById("virtualIdentityExtension_vIErrorBox").removeAttribute("hidden");
+        document.getElementById("virtualIdentityExtension_vIErrorBox").setAttribute("class", "console-box");
+        vI.prefroot.setBoolPref("javascript.options.showInConsole", true);
+        vI.prefroot.setBoolPref("browser.dom.window.dump.enabled", true);
+        vI.prefroot.setBoolPref("javascript.options.strict", true);
+    }
+}
+
+addEventListener('messagepane-loaded', extensionInit, true);
   // this is the entry place, nameSpaceWrapper is loaded and the show can start
   try {

content/vI_overlay.xul

@@ -25 +25 @@
 
 <overlay id="messengerWindow" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-  <script type="application/x-javascript" src="chrome://v_identity/content/vI_overlay.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_overlay.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_upgrade.js" />
+    <script type="application/x-javascript" src="chrome://v_identity/content/vI_storage.js" />
+
+    <vbox id="messagepanebox" >
+        <splitter id="virtualIdentityExtension_vIErrorBoxSplitter" hidden="true" />
+        <vbox id="virtualIdentityExtension_vIErrorBox" context="ConsoleContext" sortOrder="reverse" hidden="true" />
+    </vbox>
 </overlay>

content/vI_upgrade.js

@@ -58 +58 @@
         if (!currentVersion) return false;
         currentVersion = currentVersion.split(/\./);
-        var nextVersion = currentVersion[0] + "." + currentVersion[1] + "."
-        if (currentVersion[2].match(/pre/))
+        var nextVersion = currentVersion[0];
+        if (currentVersion.length > 1)
+          nextVersion += "." + currentVersion[1] + "."
+        if (currentVersion.length > 2) {
+          if (currentVersion[2].match(/pre/))
             nextVersion += parseInt(currentVersion[2])
-        else nextVersion += parseInt(currentVersion[2]) + 1
+          else nextVersion += parseInt(currentVersion[2]) + 1
+        }
+        else
+          nextVersion += "1"
             
-        let window = Cc['@mozilla.org/appshell/window-mediator;1']
-            .getService(Ci.nsIWindowMediator)
-            .getMostRecentWindow("mail:3pane");
-        var extVersion = window.virtualIdentityExtension.extensionVersion;
-        
         // don't show the dialog if we do a one-step upgrade
-        if (upgrade.versionChecker.compare(extVersion, nextVersion) <= 0) {
+        if (upgrade.versionChecker.compare(vI.extensionVersion, nextVersion) <= 0) {
             Log.debug("starting quick_upgrade.\n")
             upgrade.__initRequirements();