Changeset d5349d

Timestamp:

Oct 15, 2014, 4:27:45 PM (6 years ago)

Author:

rene <rene@…>

Branches:

ng_0.9

Children:

162a67

Parents:

71a4b1

Message:

cleanup for javascript strict mode

Files:

• content/prefDialog/vI_prefDialog_FolderPicker.js (modified) (12 diffs)
• content/prefDialog/vI_prefDialog_TB3FolderPicker.js (modified) (4 diffs)
• content/vI_rdfDataTree.js (modified) (4 diffs)
• modules/vI_account.js (modified) (1 diff)
• modules/vI_accountUtils.js (modified) (2 diffs)

content/prefDialog/vI_prefDialog_FolderPicker.js

@@ -60 +60 @@
 var tmplFolderPickerId = "msgStationeryFolderPicker";
 
-
-// patch for https://bugzilla.mozilla.org/show_bug.cgi?id=889022, see there
-if (Components.classes["@mozilla.org/xre/app-info;1"].getService(Components.interfaces.nsIXULAppInfo).ID != "postbox@postbox-inc.com")
-{
-  Components.utils.import("resource:///modules/MailUtils.js");
-}
-
-if (typeof(GetMsgFolderFromUri) != "function") {
-    function GetMsgFolderFromUri(uri, checkFolderAttributes)
-    {
-        let msgfolder = null;
-        if (typeof MailUtils != 'undefined') {
-        return MailUtils.getFolderForURI(uri, checkFolderAttributes);
-        }
-        try { // Postbox
-        let resource = GetResourceFromUri(uri);
-        msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
-        if (checkFolderAttributes) {
-            if (!(msgfolder && (msgfolder.parent || msgfolder.isServer))) {
-            msgfolder = null;
-            }
-        }
-        }
-        catch (ex) {
-        //dump("failed to get the folder resource\n");
-        }
-        return msgfolder;
-    }
+var _GetMsgFolderFromUri = function(uri, checkFolderAttributes)
+{
+    let msgfolder = null;
+    if (typeof MailUtils != 'undefined') {
+    return MailUtils.getFolderForURI(uri, checkFolderAttributes);
+    }
+    try { // Postbox
+    let resource = GetResourceFromUri(uri);
+    msgfolder = resource.QueryInterface(Components.interfaces.nsIMsgFolder);
+    if (checkFolderAttributes) {
+        if (!(msgfolder && (msgfolder.parent || msgfolder.isServer))) {
+        msgfolder = null;
+        }
+    }
+    }
+    catch (ex) {
+    //dump("failed to get the folder resource\n");
+    }
+    return msgfolder;
 }
   
-function setDefaultCopiesAndFoldersPrefs(identity, server, accountData)
+var setDefaultCopiesAndFoldersPrefs = function(identity, server, accountData)
 {
     var am = Components.classes["@mozilla.org/messenger/account-manager;1"].getService(Components.interfaces.nsIMsgAccountManager);
@@ -112 +103 @@
 
 
-function onInitCopiesAndFolders()
+var onInitCopiesAndFolders = function()
 {
     SetSpecialFolderNamesWithDelims();
@@ -141 +132 @@
 
 // Initialize the picker mode choices (account/folder picker) into global vars
-function SetGlobalRadioElemChoices()
+var SetGlobalRadioElemChoices = function()
 {
     var pickerModeElement = document.getElementById("VIdent_identity.fccFolderPickerMode");
@@ -165 +156 @@
  * preferences file.
  */
-function SetFolderDisplay(pickerMode, disableMode,
+var SetFolderDisplay = function(pickerMode, disableMode,
                           radioElemPrefix, 
                           accountPickerId, 
@@ -231 +222 @@
 // Create a set of global special folder vars to be suffixed to the
 // server URI of the selected account.
-function SetSpecialFolderNamesWithDelims()
+var SetSpecialFolderNamesWithDelims = function()
 {
     var folderDelim = "/";
@@ -241 +232 @@
 }
 
-function onSaveCopiesAndFolders()
+var onSaveCopiesAndFolders = function()
 {
     vI.SaveFolderSettings( gFccRadioElemChoice, 
@@ -269 +260 @@
 
 // Check the Fcc Self item and setup associated picker state 
-function setupFccItems()
+var setupFccItems = function()
 { 
     var broadcaster = document.getElementById("VIdent_broadcaster_doFcc");
@@ -285 +276 @@
 
 // Set up picker settings for Sent Folder 
-function SetupFccPickerState(pickerMode, accountPickerId, folderPickerId)
+var SetupFccPickerState = function(pickerMode, accountPickerId, folderPickerId)
 {
     switch (pickerMode) {
@@ -308 +299 @@
 
 // Enable and disable pickers based on the radio element clicked
-function SetPickerEnabling(enablePickerId, disablePickerId)
+var SetPickerEnabling = function(enablePickerId, disablePickerId)
 {
     var activePicker = document.getElementById(enablePickerId);
@@ -318 +309 @@
 
 // Set radio element choices and picker states
-function setPickersState(enablePickerId, disablePickerId, event)
+var setPickersState = function(enablePickerId, disablePickerId, event)
 {
     SetPickerEnabling(enablePickerId, disablePickerId);
@@ -365 +356 @@
 // This routine is to restore the correct radio element 
 // state when the fcc self checkbox broadcasts the change
-function SetRadioButtons(selectPickerId, unselectPickerId)
+var SetRadioButtons = function(selectPickerId, unselectPickerId)
 {
     var activeRadioElem = document.getElementById(selectPickerId);
@@ -377 +368 @@
 vI.gTmplRadioElemChoice = gTmplRadioElemChoice;
 
+// patch for https://bugzilla.mozilla.org/show_bug.cgi?id=889022, see there
+Components.utils.import("resource:///modules/MailUtils.js");
+if (typeof(GetMsgFolderFromUri) != "function") {
+    var GetMsgFolderFromUri = _GetMsgFolderFromUri;
+}
+
 }});

content/prefDialog/vI_prefDialog_TB3FolderPicker.js

@@ -46 +46 @@
 virtualIdentityExtension.ns(function() { with (virtualIdentityExtension.LIB) {
 
-function InitFolderDisplays(msgFolder, accountPickerId, folderPickerId) {
+var InitFolderDisplays = function(msgFolder, accountPickerId, folderPickerId) {
     var accountPicker = document.getElementById(accountPickerId);
     var folderPicker = document.getElementById(folderPickerId);
@@ -54 +54 @@
 
 // Initialize the folder display based on prefs values
-function InitFolderDisplay(folder, folderPicker) {
+var InitFolderDisplay = function(folder, folderPicker) {
     try {
       folderPicker.firstChild.selectFolder(folder);
@@ -64 +64 @@
 
 // Capture any menulist changes
-function noteSelectionChange(radioItemId, aEvent)
+var noteSelectionChange = function(radioItemId, aEvent)
 {
     var checkedElem = document.getElementById(radioItemId);
@@ -93 +93 @@
 
 // Save folder settings and radio element choices
-function SaveFolderSettings(radioElemChoice, 
+var SaveFolderSettings = function(radioElemChoice, 
                             radioGroupId,
                             folderSuffix,

content/vI_rdfDataTree.js

@@ -39 +39 @@
 
 //prepares an object for easy comparison against another. for strings, lowercases them
-function prepareForComparison (element, field) {
+var prepareForComparison = function(element, field) {
     if (field == "changedCol") {
         field = "changed"
@@ -52 +52 @@
 
 
-function rdfDataTree(treeType, rdfDatasource) {
+var rdfDataTree = function(treeType, rdfDatasource) {
     this.treeType = treeType;
     this._rdfDatasource = rdfDatasource;
@@ -282 +282 @@
         };
         this.getCellProperties = function(row,col,props){
-            if (rdfDataTreeCollection._braille) return;
-            var aserv=Components.classes["@mozilla.org/atom-service;1"].
-                getService(Components.interfaces.nsIAtomService);
-            if (typeof props == 'undefined') {
-                // Requires Gecko 22
-                switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) {
-                    case "yes": return aserv.getAtom("yes"); break;
-                    case "no":  return aserv.getAtom("no"); break;
-                }
-            } else {
-                // Obsolete since Gecko 22
-                switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) {
-                    case "yes": props.AppendElement(aserv.getAtom("yes")); break;
-                    case "no":  props.AppendElement(aserv.getAtom("no")); break;
+            var returnValue = null;
+            if (!rdfDataTreeCollection._braille) {
+                var aserv=Components.classes["@mozilla.org/atom-service;1"].
+                    getService(Components.interfaces.nsIAtomService);
+                if (typeof props == 'undefined') {
+                    // Requires Gecko 22
+                    switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) {
+                        case "yes": returnValue = aserv.getAtom("yes"); break;
+                        case "no":  returnValue = aserv.getAtom("no"); break;
+                    }
+                } else {
+                    // Obsolete since Gecko 22
+                    switch (table[row][col.id.substr(0,col.id.indexOf("_"))]) {
+                        case "yes": props.AppendElement(aserv.getAtom("yes")); break;
+                        case "no":  props.AppendElement(aserv.getAtom("no")); break;
+                    }
                 }
             }
-            return "";
+            return returnValue;
         };
     },
@@ -519 +521 @@
     }
 };
+
 vI.rdfDataTreeCollection = rdfDataTreeCollection;
 vI.rdfDataTree = rdfDataTree;

modules/vI_account.js

@@ -483 +483 @@
   return account._account;
 };
-vIaccount_cleanupSystem = account.cleanupSystem;
-vIaccount_createAccount = account.createAccount;
-vIaccount_removeUsedVIAccount = account.removeUsedVIAccount;
+var vIaccount_cleanupSystem = account.cleanupSystem;
+var vIaccount_createAccount = account.createAccount;
+var vIaccount_removeUsedVIAccount = account.removeUsedVIAccount;

modules/vI_accountUtils.js

@@ -55 +55 @@
 function getAccountsArray() {
     var accounts;
+    function sortAccounts(a, b) {
+        if (a.key == accountManager.defaultAccount.key)
+        return -1;
+        if (b.key == accountManager.defaultAccount.key)
+        return 1;
+        var aIsNews = a.incomingServer.type == "nntp";
+        var bIsNews = b.incomingServer.type == "nntp";
+        if (aIsNews && !bIsNews)
+        return 1;
+        if (bIsNews && !aIsNews)
+        return -1;
+
+        var aIsLocal = a.incomingServer.type == "none";
+        var bIsLocal = b.incomingServer.type == "none";
+        if (aIsLocal && !bIsLocal)
+        return 1;
+        if (bIsLocal && !aIsLocal)
+        return -1;
+        return 0;
+    }
     if (Components.utils.import("resource:///modules/folderUtils.jsm") && Components.utils.import("resource:///modules/iteratorUtils.jsm")
         && typeof(allAccountsSorted)=='function') {
@@ -68 +88 @@
         // Ugly hack to work around bug 41133. :-(
         accounts = accounts.filter(function isNonSuckyAccount(a) { return !!a.incomingServer; });
-        function sortAccounts(a, b) {
-            if (a.key == accountManager.defaultAccount.key)
-            return -1;
-            if (b.key == accountManager.defaultAccount.key)
-            return 1;
-            var aIsNews = a.incomingServer.type == "nntp";
-            var bIsNews = b.incomingServer.type == "nntp";
-            if (aIsNews && !bIsNews)
-            return 1;
-            if (bIsNews && !aIsNews)
-            return -1;
-
-            var aIsLocal = a.incomingServer.type == "none";
-            var bIsLocal = b.incomingServer.type == "none";
-            if (aIsLocal && !bIsLocal)
-            return 1;
-            if (bIsLocal && !aIsLocal)
-            return -1;
-            return 0;
-        }
         accounts.sort(sortAccounts);
     }