Changeset 7204cb


Ignore:
Timestamp:
Nov 4, 2014, 11:36:58 AM (7 years ago)
Author:
rene <rene@…>
Branches:
ng_0.9
Children:
ecb992
Parents:
509348
Message:

fixes after layout changes

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • content/vI_overlay.js

    r509348 r7204cb  
    1   /* ***** BEGIN LICENSE BLOCK *****
    2       This program is free software; you can redistribute it and/or modify
    3       it under the terms of the GNU General Public License as published by
    4       the Free Software Foundation; either version 2 of the License, or
    5       (at your option) any later version.
     1/* ***** BEGIN LICENSE BLOCK *****
     2    This program is free software; you can redistribute it and/or modify
     3    it under the terms of the GNU General Public License as published by
     4    the Free Software Foundation; either version 2 of the License, or
     5    (at your option) any later version.
    66
    7       This program is distributed in the hope that it will be useful,
    8       but WITHOUT ANY WARRANTY; without even the implied warranty of
    9       MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    10       GNU General Public License for more details.
     7    This program is distributed in the hope that it will be useful,
     8    but WITHOUT ANY WARRANTY; without even the implied warranty of
     9    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     10    GNU General Public License for more details.
    1111
    12       You should have received a copy of the GNU General Public License
    13       along with this program; if not, write to the Free Software
    14       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
     12    You should have received a copy of the GNU General Public License
     13    along with this program; if not, write to the Free Software
     14    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
    1515
    16       The Original Code is the Virtual Identity Extension.
     16    The Original Code is the Virtual Identity Extension.
    1717
    18       The Initial Developer of the Original Code is Rene Ejury.
    19       Portions created by the Initial Developer are Copyright (C) 2011
    20       the Initial Developer. All Rights Reserved.
     18    The Initial Developer of the Original Code is Rene Ejury.
     19    Portions created by the Initial Developer are Copyright (C) 2011
     20    the Initial Developer. All Rights Reserved.
    2121
    22       Contributor(s):
    23    * ***** END LICENSE BLOCK ***** */
     22    Contributor(s):
     23 * ***** END LICENSE BLOCK ***** */
    2424
    25   Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
    26   virtualIdentityExtension.ns(function () {
    27     with(virtualIdentityExtension.LIB) {
     25Components.utils.import("resource://v_identity/vI_nameSpaceWrapper.js");
     26virtualIdentityExtension.ns(function () {
     27  with(virtualIdentityExtension.LIB) {
    2828
    29       let Log = vI.setupLogging("virtualIdentity.overlay");
     29    let Log = vI.setupLogging("virtualIdentity.overlay");
    3030
    31       Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
    32       Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
    33       Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension);
     31    Components.utils.import("resource://v_identity/vI_rdfDatasource.js", virtualIdentityExtension);
     32    Components.utils.import("resource://v_identity/vI_account.js", virtualIdentityExtension);
     33    Components.utils.import("resource://v_identity/vI_prefs.js", virtualIdentityExtension);
    3434
    35       Components.utils.import("resource://gre/modules/AddonManager.jsm");
     35    Components.utils.import("resource://gre/modules/AddonManager.jsm");
    3636
    37       const virtualIdentity_ID = "{dddd428e-5ac8-4a81-9f78-276c734f75b8}"
    38       AddonManager.getAddonByID(virtualIdentity_ID, function (addon) {
    39         if (addon)
    40           vI.extensionVersion = addon.version;
    41       });
     37    const virtualIdentity_ID = "{dddd428e-5ac8-4a81-9f78-276c734f75b8}"
     38    AddonManager.getAddonByID(virtualIdentity_ID, function (addon) {
     39      if (addon)
     40        vI.extensionVersion = addon.version;
     41    });
    4242
    4343
    44       function extensionInit() {
    45         Log.debug("init")
    46         vI.upgrade.quickUpgrade();
    47         vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories
     44    function extensionInit() {
     45      Log.debug("init")
     46      vI.upgrade.quickUpgrade();
     47      vI.vIaccount_cleanupSystem(); // always clean leftover accounts and directories
    4848
    49         if (vI.vIprefs.get("error_console")) {
    50           document.getElementById("virtualIdentityExtension_vIErrorBoxSplitter").removeAttribute("hidden");
    51           document.getElementById("virtualIdentityExtension_vIErrorBox").removeAttribute("hidden");
    52           document.getElementById("virtualIdentityExtension_vIErrorBox").setAttribute("class", "console-box");
    53           vI.prefroot.setBoolPref("javascript.options.showInConsole", true);
    54           vI.prefroot.setBoolPref("browser.dom.window.dump.enabled", true);
    55           vI.prefroot.setBoolPref("javascript.options.strict", true);
    56         }
     49      if (vI.vIprefs.get("error_console")) {
     50        document.getElementById("virtualIdentityExtension_vIErrorBoxSplitter").removeAttribute("hidden");
     51        document.getElementById("virtualIdentityExtension_vIErrorBox").removeAttribute("hidden");
     52        document.getElementById("virtualIdentityExtension_vIErrorBox").setAttribute("class", "console-box");
     53        vI.prefroot.setBoolPref("javascript.options.showInConsole", true);
     54        vI.prefroot.setBoolPref("browser.dom.window.dump.enabled", true);
     55        vI.prefroot.setBoolPref("javascript.options.strict", true);
    5756      }
     57    }
    5858
    59       addEventListener('messagepane-loaded', extensionInit, true);
    60       // this is the entry place, nameSpaceWrapper is loaded and the show can start
    61       try {
    62         Components.utils.import("resource://v_identity/plugins/conversations.js", virtualIdentityExtension);
    63       } catch (e) {
    64         vI.dumpCallStack(e);
    65       }
     59    addEventListener('messagepane-loaded', extensionInit, true);
     60    // this is the entry place, nameSpaceWrapper is loaded and the show can start
     61    try {
     62      Components.utils.import("resource://v_identity/plugins/conversations.js", virtualIdentityExtension);
     63    } catch (e) {
     64      vI.dumpCallStack(e);
     65    }
    6666
    6767
    68     }
    69   });
     68  }
     69});
  • modules/vI_rdfDatasource.js

    r509348 r7204cb  
    705705
    706706  __getDescriptionAndType: function (recipient, recipientType) {
    707     if (recipientType == "addr_newsgroups") return {
    708       recDesc: recipient,
    709       recType: "newsgroup"
     707    if (recipientType == "addr_newsgroups") {
     708      return {
     709        recDesc: recipient,
     710        recType: "newsgroup"
     711      }
    710712    } else if (this.__isMailingList(recipient)) {
    711713      Log.debug("__getDescriptionAndType: '" + recipient + "' is MailList");
Note: See TracChangeset for help on using the changeset viewer.