Changeset 7204cb

Timestamp:

Nov 4, 2014, 11:36:58 AM (8 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

ecb992

Parents:

509348

Message:

fixes after layout changes

Files:

• content/vI_overlay.js (modified) (1 diff)
• modules/vI_rdfDatasource.js (modified) (1 diff)

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.
+/* ***** 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.
+    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
+    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 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.
+    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 ***** */
+    Contributor(s): 
+ * ***** END LICENSE BLOCK ***** */
 
-  Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
-  virtualIdentityExtension.ns(function () {
-    with(virtualIdentityExtension.LIB) {
+Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
+virtualIdentityExtension.ns(function () {
+  with(virtualIdentityExtension.LIB) {
 
-      let Log = vI.setupLogging("virtualIdentity.overlay");
+    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://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");
+    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;
-      });
+    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")
-        vI.upgrade.quickUpgrade();
-        vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories
+    function extensionInit() {
+      Log.debug("init")
+      vI.upgrade.quickUpgrade();
+      vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories
 
-        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);
-        }
+      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 {
-        Components.utils.import("resource://v_identity/plugins/conversations.js", virtualIdentityExtension);
-      } catch (e) {
-        vI.dumpCallStack(e);
-      }
+    addEventListener('messagepane-loaded', extensionInit, true);
+    // this is the entry place, nameSpaceWrapper is loaded and the show can start
+    try {
+      Components.utils.import("resource://v_identity/plugins/conversations.js", virtualIdentityExtension);
+    } catch (e) {
+      vI.dumpCallStack(e);
+    }
 
 
-    }
-  });
+  }
+});

modules/vI_rdfDatasource.js

@@ -705 +705 @@
 
   __getDescriptionAndType: function (recipient, recipientType) {
-    if (recipientType == "addr_newsgroups") return {
-      recDesc: recipient,
-      recType: "newsgroup"
+    if (recipientType == "addr_newsgroups") {
+      return {
+        recDesc: recipient,
+        recType: "newsgroup"
+      }
     } else if (this.__isMailingList(recipient)) {
       Log.debug("__getDescriptionAndType: '" + recipient + "' is MailList");