[Pkg-mozext-commits] [firetray] 08/14: Revert "Fix `let` and `const` use according to ES6."

David Prévot taffit at moszumanska.debian.org
Wed May 4 20:50:11 UTC 2016


This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository firetray.

commit c7cae8560ef6308829bacd912d6f34254ac23648
Author: foudfou <foudil.newbie+git at gmail.com>
Date:   Mon Dec 14 09:23:37 2015 +0100

    Revert "Fix `let` and `const` use according to ES6."
    
    This reverts commit f22394b1f6decd74badf58dfc57500b46b1cfdf6.
---
 src/chrome/content/options.js        | 46 +++++++++++++++++++------
 src/chrome/content/overlay.js        | 13 ++++++-
 src/components/firetray-clhandler.js | 10 +++---
 src/modules/commons.js               | 66 ++++++++++++++++++++----------------
 src/modules/log4moz.js               | 12 +++----
 5 files changed, 96 insertions(+), 51 deletions(-)

diff --git a/src/chrome/content/options.js b/src/chrome/content/options.js
index cf544eb..a1342f6 100644
--- a/src/chrome/content/options.js
+++ b/src/chrome/content/options.js
@@ -1,21 +1,21 @@
 /* -*- Mode: js2; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
 
 Cu.import("resource://firetray/FiretrayHandler.jsm");
 Cu.import("resource://firetray/commons.js");
 
-var TREEROW_ACCOUNT_OR_SERVER_TYPE_NAME     = 0;
-var TREEROW_ACCOUNT_OR_SERVER_TYPE_EXCLUDED = 1;
-var TREEROW_ACCOUNT_OR_SERVER_TYPE_ORDER    = 2;
-var TREELEVEL_SERVER_TYPES      = 0;
-var TREELEVEL_EXCLUDED_ACCOUNTS = 1;
+const TREEROW_ACCOUNT_OR_SERVER_TYPE_NAME     = 0;
+const TREEROW_ACCOUNT_OR_SERVER_TYPE_EXCLUDED = 1;
+const TREEROW_ACCOUNT_OR_SERVER_TYPE_ORDER    = 2;
+const TREELEVEL_SERVER_TYPES      = 0;
+const TREELEVEL_EXCLUDED_ACCOUNTS = 1;
 
-var PREF_DEFAULT_PANE = "pref-pane-windows";
+const PREF_DEFAULT_PANE = "pref-pane-windows";
 
-var log = firetray.Logging.getLogger("firetray.UIOptions");
+let log = firetray.Logging.getLogger("firetray.UIOptions");
 
 var firetrayUIOptions = {
   strings: null,
@@ -23,6 +23,7 @@ var firetrayUIOptions = {
   listeners: {},
 
   onLoad: function(e) {
+    log.debug("FULL FEATURED="+firetray.Handler.support['full_feat']);
     this.strings = document.getElementById("firetray-options-strings");
     this.prefwindow = document.getElementById("firetray-preferences");
     if (!this.prefwindow)
@@ -157,6 +158,7 @@ var firetrayUIOptions = {
   updateWindowAndIconOptions: function() {
     let hides_on_close    = document.getElementById("ui_hides_on_close").checked;
     let hides_on_minimize = document.getElementById("ui_hides_on_minimize").checked;
+    log.debug("hides_on_close="+hides_on_close+", hides_on_minimize="+hides_on_minimize);
     let doDisable = !(hides_on_close || hides_on_minimize);
     document.getElementById('ui_hides_single_window').disabled = doDisable;
     document.getElementById('ui_hides_last_only').disabled = doDisable;
@@ -191,6 +193,7 @@ var firetrayUIOptions = {
 
   initIconNames: function(prefIconNames, uiIconNameId, defaultIconName) {
     let appIconNames = firetray.Utils.getArrayPref(prefIconNames);
+    log.debug("appIconNames="+appIconNames);
     let len = appIconNames.length;
     if (len>2)
       throw new RangeError("Too many icon names");
@@ -214,8 +217,10 @@ var firetrayUIOptions = {
     for (let i=1; i<3; ++i) {
       let textbox = document.getElementById(uiIconNameId+i);
       let val = textbox.value.trim();
+      log.debug("val="+val);
       if (val) iconNames.push(val);
     }
+    log.debug("iconNames="+iconNames);
     firetray.Utils.setArrayPref(prefIconNames, iconNames); // FIXME: should be a <preference>
   },
 
@@ -306,6 +311,7 @@ var firetrayUIOptions = {
   },
 
   updateNotificationSettings: function() {
+    log.debug("updateNotificationSettings");
     let mailNotifyRadio = document.getElementById("ui_radiogroup_mail_notification");
     let mailNotificationType = +mailNotifyRadio.getItemAtIndex(mailNotifyRadio.selectedIndex).value;
     this.disableNotificationMaybe(mailNotificationType);
@@ -318,6 +324,7 @@ var firetrayUIOptions = {
   },
 
   disableNotificationMaybe: function(notificationSetting) {
+    log.debug("disableNotificationMaybe: "+notificationSetting);
 
     let iconTextColor = document.getElementById("icon_text_color");
     this.disableChildren(iconTextColor,
@@ -335,6 +342,7 @@ var firetrayUIOptions = {
   },
 
   disableMessageCountMaybe: function(msgCountType) {
+    log.debug("disableMessageCountMaybe: "+msgCountType);
     let msgCountTypeIsNewMessages = (msgCountType === FIRETRAY_MESSAGE_COUNT_TYPE_NEW);
 
     let notificationUnreadCount = document.getElementById("ui_mail_notification_unread_count");
@@ -439,12 +447,14 @@ var firetrayUIOptions = {
 
     let prefExcludedFoldersFlags = firetray.Utils.prefService
       .getIntPref("excluded_folders_flags");
+    log.debug("prefExcludedFoldersFlags="+prefExcludedFoldersFlags.toString(16));
     for (let folderType in FLDRS_UNINTERESTING) {
       let localizedFolderType = this.strings.getString(folderType);
       let folderTypeVal = FLDRS_UNINTERESTING[folderType];
       let item = excludedFoldersList.appendItem(localizedFolderType, folderTypeVal);
       item.setAttribute("observes", "broadcaster-notification-disabled");
       let folderTypeSet = (folderTypeVal & prefExcludedFoldersFlags);
+      log.debug("folder: "+folderType+" folderTypeVal="+folderTypeVal+" folderTypeSet="+folderTypeSet);
       if (!folderTypeSet) {
         excludedFoldersList.ensureElementIsVisible(item); // bug 326445
         excludedFoldersList.addItemToSelection(item); // does trigger onselect...
@@ -462,6 +472,7 @@ var firetrayUIOptions = {
   },
 
   saveExcludedFoldersFlags: function(uiElt) {
+    log.debug("LAST SELECTED: "+uiElt.currentItem.label);
     let excludedFoldersFlags = 0;
     for (let i = 0, len=uiElt.itemCount; i<len; ++i) {
       let folder = uiElt.getItemAtIndex(i);
@@ -470,6 +481,7 @@ var firetrayUIOptions = {
       else
         excludedFoldersFlags |= folder.value;  // set
     }
+    log.debug("excluded folders flags: "+excludedFoldersFlags.toString(16));
     return excludedFoldersFlags;
   },
 
@@ -480,7 +492,9 @@ var firetrayUIOptions = {
     let that = this;
     try {
       let cells = row.childNodes; // .getElementsByTagName('treecell');
+      log.debug("CELLS: "+cells);
       for (let i=0, len=cells.length; i<len; ++i) {
+        log.debug("i: "+i+", cell:"+cells[i]);
         if (disable === true) {
           cells[i].setAttribute('properties', "disabled");
           if (i === TREEROW_ACCOUNT_OR_SERVER_TYPE_EXCLUDED) {
@@ -511,6 +525,7 @@ var firetrayUIOptions = {
     let serverTypes = mailAccounts["serverTypes"];
     let accountsExcluded = mailAccounts["excludedAccounts"];
     let accountsByServerType = firetray.Messaging.accountsByServerType();
+    log.debug(JSON.stringify(accountsByServerType));
 
     // sort serverTypes according to order
     let serverTypesSorted = Object.keys(serverTypes);
@@ -523,6 +538,7 @@ var firetrayUIOptions = {
         return 1;
       return 0; // no sorting
     });
+    log.debug("serverTypesSorted: "+serverTypesSorted);
 
     let target = document.getElementById("ui_mail_accounts");
     for (let i=0, len=serverTypesSorted.length; i<len; ++i) {
@@ -556,6 +572,7 @@ var firetrayUIOptions = {
       // add actual accounts as children
       let accountChildren = document.createElement('treechildren');
       let typeAccounts = accountsByServerType[serverTypeName];
+      log.debug("type: "+serverTypeName+", Accounts: "+JSON.stringify(typeAccounts));
       if (typeof(typeAccounts) == "undefined")
         continue;
 
@@ -607,6 +624,7 @@ var firetrayUIOptions = {
         firetray.Messaging.applyToSubfolders(msgAccount.rootFolder, true, function(folder) {
           if (!(folder.flags & Ci.nsMsgFolderFlags.Favorite)) return;
 
+          log.debug("adding folder favorite="+folder.prettyName);
           let folderItem = document.createElement('treeitem');
           let folderRow = document.createElement('treerow');
 
@@ -661,21 +679,25 @@ var firetrayUIOptions = {
   },
 
   onMutation: function(mutation) {
+    log.debug("mutation: type="+mutation.type+" node="+mutation.target.nodeName+" attr="+mutation.attributeName);
     if (mutation.type !== "attributes") return;
 
     if (mutation.attributeName === "value") { // checkbox
+      log.debug("value changed!");
       let checkboxCell = mutation.target;
       let tree = document.getElementById("ui_tree_mail_accounts");
 
       let subRows = firetray.Utils.XPath(
         checkboxCell,
         'ancestor::xul:treeitem[1]/child::xul:treechildren/xul:treeitem/xul:treerow');
+      log.debug("subRows="+subRows);
       for (let i=0, len=subRows.length; i<len; ++i) {
         firetrayUIOptions._disableTreeRow(
           subRows[i], (checkboxCell.getAttribute("value") === "false"));
       }
 
     } else if (mutation.attributeName == "label") { // text
+      log.debug("label changed!");
       log.warn("NOT IMPLEMENTED YET: move row to new rank"); // TODO
     } else {
       return;
@@ -707,6 +729,7 @@ var firetrayUIOptions = {
   saveTreeAccountsOrServerTypes: function() { // FIXME: broken ?
     let tree = document.getElementById("ui_tree_mail_accounts");
 
+    log.debug("VIEW="+ tree.view + ", rowCount="+tree.view.rowCount);
     let prefObj = {"serverTypes":{}, "excludedAccounts":[]};
     for (let i=0, len=tree.view.rowCount; i<len; ++i) {
       let accountOrServerTypeName = tree.view.getCellText(
@@ -718,6 +741,7 @@ var firetrayUIOptions = {
       let accountOrServerTypeOrder = parseInt(
         tree.view.getCellText(
           i, tree.columns.getNamedColumn("account_or_server_type_order")));
+      log.debug("account: "+accountOrServerTypeName+", "+accountOrServerTypeExcluded);
 
       if (tree.view.getLevel(i) === TREELEVEL_SERVER_TYPES) {
         prefObj["serverTypes"][accountOrServerTypeName] =
@@ -737,12 +761,14 @@ var firetrayUIOptions = {
     }
 
     let prefStr = JSON.stringify(prefObj);
+    log.debug("prefStr"+prefStr);
 
     /* return the new prefString to be stored by pref system */
     return prefStr;
   },
 
   onKeyPressTreeAccountsOrServerTypes: function(event) {
+    log.debug("TREE KEYPRESS: "+event.originalTarget);
     let tree = document.getElementById("ui_tree_mail_accounts");
     let col = tree.editingColumn; // col.index
 
diff --git a/src/chrome/content/overlay.js b/src/chrome/content/overlay.js
index e819b5e..87407b5 100644
--- a/src/chrome/content/overlay.js
+++ b/src/chrome/content/overlay.js
@@ -9,7 +9,7 @@ if ("undefined" == typeof(Ci)) var Ci = Components.interfaces;
 if ("undefined" == typeof(Cu)) var Cu = Components.utils;
 
 // can't use 'log': don't pollute global (chrome) namespace
-var firetray_log = firetray.Logging.getLogger("firetray.Chrome");
+let firetray_log = firetray.Logging.getLogger("firetray.Chrome");
 
 // https://groups.google.com/group/mozilla.dev.extensions/browse_thread/thread/e89e9c2a834ff2b6#
 var firetrayChrome = { // each new window gets a new firetrayChrome !
@@ -20,13 +20,16 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
   onLoad: function(win) {
     this.strings = document.getElementById("firetray-strings"); // chrome-specific
 
+    firetray_log.debug("Handler initialized: "+firetray.Handler.initialized);
     let init = firetray.Handler.initialized || firetray.Handler.init();
 
+    firetray_log.debug("ONLOAD");
     this.winId = firetray.Handler.registerWindow(win);
 
     win.addEventListener('close', firetrayChrome.onClose, true);
     this.hijackTitlebarButtons();
 
+    firetray_log.debug('Firetray LOADED: ' + init);
     return true;
   },
 
@@ -36,6 +39,8 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
   onQuit: function(win) {
     win.removeEventListener('close', firetrayChrome.onClose, true);
     firetray.Handler.unregisterWindow(win);
+    firetray_log.debug("windowsCount="+firetray.Handler.windowsCount+", visibleWindowsCount="+firetray.Handler.visibleWindowsCount);
+    firetray_log.debug('Firetray UNLOADED !');
   },
 
   /* until we find a fix (TODO), we need to set browser.tabs.warnOnClose=false
@@ -44,11 +49,14 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
    use trying to set warnOnClose=false temporarily in onClose, since onClose is
    called *after* the popup */
   onClose: function(event) {
+    firetray_log.debug('Firetray CLOSE');
     let hides_on_close = firetray.Utils.prefService.getBoolPref('hides_on_close');
+    firetray_log.debug('hides_on_close: '+hides_on_close);
     if (!hides_on_close) return false;
 
     let hides_single_window = firetray.Utils.prefService.getBoolPref('hides_single_window');
     let hides_last_only = firetray.Utils.prefService.getBoolPref('hides_last_only');
+    firetray_log.debug('hides_single_window='+hides_single_window+', windowsCount='+firetray.Handler.windowsCount);
     if (hides_last_only && (firetray.Handler.windowsCount > 1)) return true;
 
     if (hides_single_window)
@@ -68,6 +76,7 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
   hijackTitlebarButtons: function() {
     Object.keys(this.titlebarDispatch).forEach(function(id) {
       if (firetrayChrome.replaceCommand(id, this.titlebarDispatch[id])) {
+        firetray_log.debug('replaced command='+id);
       }
     }, this);
   },
@@ -84,6 +93,7 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
   replaceCommand: function(eltId, gotHidden) {
     let elt = document.getElementById(eltId);
     if (!elt) {
+      firetray_log.debug("Element '"+eltId+"' not found. Command not replaced.");
       return false;
     }
 
@@ -99,6 +109,7 @@ var firetrayChrome = { // each new window gets a new firetrayChrome !
 
     let callback = function(event) {
       if (event.target.id === eltId) {
+        firetray_log.debug(prevent.event +' on '+eltId);
         if (gotHidden())
           prevent.func(event);
       }
diff --git a/src/components/firetray-clhandler.js b/src/components/firetray-clhandler.js
index 034d28d..51970d9 100644
--- a/src/components/firetray-clhandler.js
+++ b/src/components/firetray-clhandler.js
@@ -1,14 +1,14 @@
 // https://developer.mozilla.org/en/Chrome/Command_Line
 
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 Cu.import("resource://firetray/logging.jsm");
 Cu.import("resource://firetray/FiretrayHandler.jsm");
 
-var log = firetray.Logging.getLogger("firetray.clhandler");
+let log = firetray.Logging.getLogger("firetray.clhandler");
 
 function firetayCommandLineHandler() {}
 firetayCommandLineHandler.prototype = {
@@ -45,11 +45,13 @@ firetayCommandLineHandler.prototype = {
 
       if (cmdLine.handleFlag("firetrayShowHide", false)) {
         checkAppStarted();
+        log.debug("*** CmdLine call -firetrayShowHide ***");
         firetray.Handler.showHideAllWindows();
         cmdLine.preventDefault = true;
 
       } else if (cmdLine.handleFlag("firetrayPresent", false)) {
         checkAppStarted();
+        log.debug("*** CmdLine call -firetrayPresent ***");
         firetray.Handler.showAllWindowsAndActivate();
         cmdLine.preventDefault = true;
       }
diff --git a/src/modules/commons.js b/src/modules/commons.js
index 07e1075..d2d1701 100644
--- a/src/modules/commons.js
+++ b/src/modules/commons.js
@@ -18,48 +18,48 @@ var EXPORTED_SYMBOLS =
     "FIRETRAY_CHAT_ICON_BLINK_STYLE_FADE", "FIRETRAY_APPINDICATOR_ID",
     "FIRETRAY_APP_DB", "FIRETRAY_CB_SENTINEL" ];
 
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cu = Components.utils;
+const Cc = Components.classes;
+const Ci = Components.interfaces;
+const Cu = Components.utils;
 
 Cu.import("resource://gre/modules/Services.jsm");
 Cu.import("resource://firetray/logging.jsm");
 
-var FIRETRAY_VERSION     = "0.6.0"; // needed for sync call of onVersionChange() :(
-var FIRETRAY_OS_SUPPORT  = ['freebsd', 'linux', 'winnt']; // install.rdf sync :(
-var FIRETRAY_ID          = "{9533f794-00b4-4354-aa15-c2bbda6989f8}";
-var FIRETRAY_PREF_BRANCH = "extensions.firetray.";
-var FIRETRAY_SPLASH_PAGE = "http://foudfou.github.com/FireTray/";
+const FIRETRAY_VERSION     = "0.6.0"; // needed for sync call of onVersionChange() :(
+const FIRETRAY_OS_SUPPORT  = ['freebsd', 'linux', 'winnt']; // install.rdf sync :(
+const FIRETRAY_ID          = "{9533f794-00b4-4354-aa15-c2bbda6989f8}";
+const FIRETRAY_PREF_BRANCH = "extensions.firetray.";
+const FIRETRAY_SPLASH_PAGE = "http://foudfou.github.com/FireTray/";
 
-var FIRETRAY_APPLICATION_ICON_TYPE_THEMED = 0;
-var FIRETRAY_APPLICATION_ICON_TYPE_CUSTOM = 1;
+const FIRETRAY_APPLICATION_ICON_TYPE_THEMED = 0;
+const FIRETRAY_APPLICATION_ICON_TYPE_CUSTOM = 1;
 
-var FIRETRAY_MIDDLE_CLICK_ACTIVATE_LAST = 0;
-var FIRETRAY_MIDDLE_CLICK_SHOW_HIDE     = 1;
+const FIRETRAY_MIDDLE_CLICK_ACTIVATE_LAST = 0;
+const FIRETRAY_MIDDLE_CLICK_SHOW_HIDE     = 1;
 
-var FIRETRAY_MESSAGE_COUNT_TYPE_UNREAD  = 0;
-var FIRETRAY_MESSAGE_COUNT_TYPE_NEW     = 1;
+const FIRETRAY_MESSAGE_COUNT_TYPE_UNREAD  = 0;
+const FIRETRAY_MESSAGE_COUNT_TYPE_NEW     = 1;
 
-var FIRETRAY_NOTIFICATION_MESSAGE_COUNT = 0;
-var FIRETRAY_NOTIFICATION_NEWMAIL_ICON  = 1;
-var FIRETRAY_NOTIFICATION_CUSTOM_ICON   = 2;
+const FIRETRAY_NOTIFICATION_MESSAGE_COUNT = 0;
+const FIRETRAY_NOTIFICATION_NEWMAIL_ICON  = 1;
+const FIRETRAY_NOTIFICATION_CUSTOM_ICON   = 2;
 
-var FIRETRAY_IM_STATUS_AVAILABLE = "user-available";
-var FIRETRAY_IM_STATUS_AWAY      = "user-away";
-var FIRETRAY_IM_STATUS_BUSY      = "user-busy";
-var FIRETRAY_IM_STATUS_OFFLINE   = "user-offline";
+const FIRETRAY_IM_STATUS_AVAILABLE = "user-available";
+const FIRETRAY_IM_STATUS_AWAY      = "user-away";
+const FIRETRAY_IM_STATUS_BUSY      = "user-busy";
+const FIRETRAY_IM_STATUS_OFFLINE   = "user-offline";
 
-var FIRETRAY_ACCOUNT_SERVER_TYPE_IM = "im";
+const FIRETRAY_ACCOUNT_SERVER_TYPE_IM = "im";
 
-var FIRETRAY_DELAY_STARTUP_MILLISECONDS = 500;
-var FIRETRAY_DELAY_NOWAIT_MILLISECONDS  = 0;
+const FIRETRAY_DELAY_STARTUP_MILLISECONDS = 500;
+const FIRETRAY_DELAY_NOWAIT_MILLISECONDS  = 0;
 
-var FIRETRAY_CHAT_ICON_BLINK_STYLE_NORMAL = 0;
-var FIRETRAY_CHAT_ICON_BLINK_STYLE_FADE   = 1;
+const FIRETRAY_CHAT_ICON_BLINK_STYLE_NORMAL = 0;
+const FIRETRAY_CHAT_ICON_BLINK_STYLE_FADE   = 1;
 
-var FIRETRAY_APPINDICATOR_ID = "firetray";
+const FIRETRAY_APPINDICATOR_ID = "firetray";
 
-var FIRETRAY_APP_DB = {
+const FIRETRAY_APP_DB = {
 
   firefox: {
     id: "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}",
@@ -111,7 +111,7 @@ var FIRETRAY_APP_DB = {
  * Note: it's not possible to define a sentinel when the return type is void.
  * Note: almost all return types end up as int's (even gboolean).
  */
-var FIRETRAY_CB_SENTINEL = -1;
+const FIRETRAY_CB_SENTINEL = -1;
 
 /**
  * firetray namespace.
@@ -120,7 +120,7 @@ if ("undefined" == typeof(firetray)) {
   var firetray = {};
 };
 
-var log = firetray.Logging.getLogger("firetray.commons");
+let log = firetray.Logging.getLogger("firetray.commons");
 
 firetray.Utils = {
   prefService: Services.prefs.getBranch(FIRETRAY_PREF_BRANCH),
@@ -135,6 +135,7 @@ firetray.Utils = {
 
       Services.obs.addObserver(this, topic, false);
       this.observedTopics[topic] = true;
+      log.debug("registred "+topic+" for "+handler);
     }, handler);
   },
 
@@ -161,6 +162,7 @@ firetray.Utils = {
     return objPref;
   },
   setObjPref: function(prefStr, obj) {
+    log.debug(obj);
     try {
       firetray.Utils.prefService.setCharPref(prefStr, JSON.stringify(obj));
     } catch (x) {
@@ -196,6 +198,7 @@ firetray.Utils = {
     let registeryValue = Cc['@mozilla.org/chrome/chrome-registry;1']
       .getService(Ci.nsIChromeRegistry)
       .convertChromeURL(uri).spec;
+    log.debug(registeryValue);
 
     if (/^file:/.test(registeryValue))
       registeryValue = this._urlToPath(registeryValue);
@@ -235,6 +238,7 @@ firetray.Utils = {
     } catch (x) {
       log.error(x);
     }
+    log.debug("XPathResult="+result.resultType);
 
     switch (result.resultType) {
     case XPathResult.NUMBER_TYPE:
@@ -248,6 +252,7 @@ firetray.Utils = {
     var list = [];
     try {
       for (let node = result.iterateNext(); node; node = result.iterateNext()) {
+        log.debug("node="+node.nodeName);
         switch (node.nodeType) {
         case node.ATTRIBUTE_NODE:
           list.push(node.value);
@@ -263,6 +268,7 @@ firetray.Utils = {
       log.error(x);
     }
 
+    log.debug("len="+list.length);
     return list;
   },
 
diff --git a/src/modules/log4moz.js b/src/modules/log4moz.js
index 52c19f7..674e240 100644
--- a/src/modules/log4moz.js
+++ b/src/modules/log4moz.js
@@ -4,14 +4,14 @@
 
 this.EXPORTED_SYMBOLS = ['Log4Moz'];
 
-var {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
+const {classes: Cc, interfaces: Ci, results: Cr, utils: Cu} = Components;
 
-var ONE_BYTE = 1;
-var ONE_KILOBYTE = 1024 * ONE_BYTE;
-var ONE_MEGABYTE = 1024 * ONE_KILOBYTE;
+const ONE_BYTE = 1;
+const ONE_KILOBYTE = 1024 * ONE_BYTE;
+const ONE_MEGABYTE = 1024 * ONE_KILOBYTE;
 
-var STREAM_SEGMENT_SIZE = 4096;
-var PR_UINT32_MAX = 0xffffffff;
+const STREAM_SEGMENT_SIZE = 4096;
+const PR_UINT32_MAX = 0xffffffff;
 
 Cu.import("resource://gre/modules/NetUtil.jsm");
 Cu.import("resource://gre/modules/FileUtils.jsm");

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firetray.git



More information about the Pkg-mozext-commits mailing list