Changeset ddb9c5

Timestamp:

Aug 24, 2008, 6:43:36 PM (12 years ago)

Author:

rene <rene@…>

Branches:

master

Children:

79c6c5

Parents:

4062d1

Message:

changed for javascript strict

Location:

chrome/content/v_identity

Files:

• vI_getHeader.js (modified) (8 diffs)
• vI_helper.js (modified) (1 diff)
• vI_htmlTextBox.js (modified) (1 diff)
• vI_rdfDataEditor.js (modified) (1 diff)
• vI_smartIdentity.js (modified) (7 diffs)
• vI_smartReplyDialog.js (modified) (1 diff)
• vI_smtpSelector.js (modified) (1 diff)
• vI_storage.js (modified) (4 diffs)
• vI_upgrade.js (modified) (3 diffs)
• v_identity.js (modified) (1 diff)

chrome/content/v_identity/vI_getHeader.js

@@ -52 +52 @@
         
         // prepare headerToSearch for speedup.
-        var index
-        for (index = 0; index < headerList.length; index++) {
+        for (var index = 0; index < headerList.length; index++) {
             var headerToSearch_splitted = headerList[index].split(/:/)
             // use first part (all before ':') as the header name
@@ -96 +95 @@
         var currentHeadersCounter = []
         // loop through the headers
-        for (header in currentHeaderData) {
-            headerName = currentHeaderData[header].headerName.toLowerCase()
+        for (var header in currentHeaderData) {
+            var headerName = currentHeaderData[header].headerName.toLowerCase()
 
             // remember list-id header to prevent using Mailing-List addresses as sender
@@ -111 +110 @@
                     "[:" + currentHeadersCounter[headerName] + "]");
             
-            for (index = 0; index < vI_getHeader.headerToSearch.length; index++) {
+            for (var index = 0; index < vI_getHeader.headerToSearch.length; index++) {
                 if (headerName == vI_getHeader.headerToSearch[index].headerNameToSearch &&
                     (isNaN(vI_getHeader.headerToSearch[index].headerNumberToSearch) ||
@@ -141 +140 @@
     
     hideExtraHeader: function() {
-        var index;
         var header_list = vI_prepareHeader.addedHeaders
-        for (index = 0; index < header_list.length; index++) {
+        for (var index = 0; index < header_list.length; index++) {
             var header_to_search_splitted=header_list[index].split(/:/)
             var header_to_search=header_to_search_splitted[0].toLowerCase()
@@ -224 +222 @@
                 + " ";
 
-            for (index = 0; index < header_list.length; index++) {
+            for (var index = 0; index < header_list.length; index++) {
                 var headerToSearch_splitted = header_list[index].split(/:/)
                 var headerToSearch = headerToSearch_splitted[0].toLowerCase()
@@ -230 +228 @@
                 var j; var found = false;
                 // check if Header is included in collapsed HeaderView
-                for (j = 0; j < gCollapsedHeaderList.length; j++) {
+                for (var j = 0; j < gCollapsedHeaderList.length; j++) {
                     if (gCollapsedHeaderList[j].name == headerToSearch) {
                         vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gCollapsedHeaderList\n");
@@ -238 +236 @@
                 if (found) continue;
                 // check if Header is included in expanded HeaderView
-                for (j = 0; j < gExpandedHeaderList.length; j++) {
+                for (var j = 0; j < gExpandedHeaderList.length; j++) {
                     if (gExpandedHeaderList[j].name == headerToSearch) {
                         vI_notificationBar.dump("## vI_prepareHeader: Header '" + headerToSearch + "' in gExpandedHeaderList\n");
@@ -276 +274 @@
             var extraHdrs = vI_prepareHeader.prefroot.getCharPref("mailnews.headers.extraExpandedHeaders").toLowerCase().split(/ /);
         
-            for (i = 0; i < vI_prepareHeader.addedHeaders.length; i++) {
-                for (j = 0; j < extraHdrs.length; j++) {
+            for (var i = 0; i < vI_prepareHeader.addedHeaders.length; i++) {
+                for (var j = 0; j < extraHdrs.length; j++) {
                     if (extraHdrs[j] == vI_prepareHeader.addedHeaders[i]) {
                         extraHdrs.splice(j,1);

chrome/content/v_identity/vI_helper.js

@@ -52 +52 @@
     getID : function (idKey) {
         if (!this.ID_NAMES) this.__getIDnames();
-        return this.ID_NAMES[idKey];
+        return (this.ID_NAMES[idKey])?this.ID_NAMES[idKey]:null;
     },
     getSMTPname : function (smtpKey) {

chrome/content/v_identity/vI_htmlTextBox.js

@@ -77 +77 @@
     __echo : function (text) {
         var text_list = text.split(/\n/)
-        for (i = 0; i < text_list.length; i++) {
+        for (var i = 0; i < text_list.length; i++) {
             if (vI_htmlTextBox.__isHR(text_list[i])) continue;
             var text_item = vI_htmlTextBox.__checkList(text_list[i]);

chrome/content/v_identity/vI_rdfDataEditor.js

@@ -60 +60 @@
         var MenuItems = document.getElementById("identity_list_popup").childNodes
         
-        for (index = 0; index < MenuItems.length; index++) {
+        for (var index = 0; index < MenuItems.length; index++) {
             if (MenuItems[index].getAttribute("value") == window.arguments[0]["idKey"]) {
                 document.getElementById("identity_list").selectedItem =

chrome/content/v_identity/vI_smartIdentity.js

@@ -158 +158 @@
         if (filterList.length == 0) filterList[0] == ""
         
-        for (i = 0; i < filterList.length; i++) {
+        for (var i = 0; i < filterList.length; i++) {
             const filterType = { None : 0, RegExp : 1, StrCmp : 2 }
             var recentfilterType; var skipRegExp = false;
@@ -168 +168 @@
             else    { vI_notificationBar.dump("## vI_smartIdentity: filter emails, compare with '"
                     + filterList[i] + "'\n"); recentfilterType = filterType.StrCmp; }
-            for (j = 0; j < smartIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in 
+            for (var j = 0; j < smartIdentities.number; j++) { // check if recent email-address (pre-choosen identity) is found in 
             // copied and adapted from correctIdentity, thank you for the RegExp-idea!
                 var add_addr = false;
@@ -204 +204 @@
         var reply_headers = vI.unicodeConverter.ConvertToUnicode(vI.preferences.getCharPref("smart_reply_headers")).split(/\n/)
                     
-        for (index = 0; index < reply_headers.length; index++) {
+        for (var index = 0; index < reply_headers.length; index++) {
             // ------------- prepare fields to read the stored header ----------------
             var replyHeader_splitted = reply_headers[index].split(/:/)
@@ -237 +237 @@
             
             // move found addresses step by step to allIdentities, and change values if requested
-            for (i = 0; i < splitted.number; i++) {
+            for (var i = 0; i < splitted.number; i++) {
                 // if there is no email than it makes no sense to use it as a sender
                 if (!splitted.emails.value[i].match(/^.*@.*$/)) {
@@ -318 +318 @@
             var smart_reply_defaultFullName = vI.unicodeConverter.ConvertToUnicode(vI.preferences.getCharPref("smart_reply_defaultFullName"))
             if (smart_reply_defaultFullName != "") {
-                for (index = 0; index < smartIdentities.number; index++) {
+                for (var index = 0; index < smartIdentities.number; index++) {
                     if (smartIdentities.fullNames[index] == "") {
                         smartIdentities.fullNames[index] = smart_reply_defaultFullName
@@ -335 +335 @@
                 vI_notificationBar.dump("## vI_smartIdentity: compare with existing Identities (ignoring FullNames).\n")
             
-                for (index = 0; index < smartIdentities.number; index++) {
+                for (var index = 0; index < smartIdentities.number; index++) {
                     var idKey = smartIdentities.getIdentityData(index).isExistingIdentity(true);
                     if (idKey) {
@@ -387 +387 @@
                 bcc_addresses.fullNames, bcc_addresses.combinedNames);
             
-            for (index = 0; index < bcc_addresses.number; index++) {
+            for (var index = 0; index < bcc_addresses.number; index++) {
                 if (allIdentities.emails[index] == bcc_addresses.emails.value[index]) {
                     skip_bcc = true; break;

chrome/content/v_identity/vI_smartReplyDialog.js

@@ -45 +45 @@
         //          id_keys : {}, smtp_keys : {} };
         vI_smartReply_dialog.all_addresses = window.arguments[0];
-        for (index = 0; index < vI_smartReply_dialog.all_addresses.number; index++) {
+        for (var index = 0; index < vI_smartReply_dialog.all_addresses.number; index++) {
             var menuentry = vI_smartReply_dialog.all_addresses.combinedNames[index]
             var id = null; var smtp = null;

chrome/content/v_identity/vI_smtpSelector.js

@@ -90 +90 @@
         vI_notificationBar.dump("## v_smtpSelector: setMenuToKey '" + smtpKey + "'\n")
         MenuItems = vI_smtpSelector.elements.Obj_SMTPServerListPopup.childNodes
-        for (index = 0; index < MenuItems.length; index++) {
+        for (var index = 0; index < MenuItems.length; index++) {
             if (MenuItems[index].localName == "menuseparator") continue;
             //~ vI_notificationBar.dump("## v_smtpSelector: compare with '" + MenuItems[index].getAttribute("key") + "'\n")

chrome/content/v_identity/vI_storage.js

@@ -78 +78 @@
             vI_notificationBar.dump("## vI_storage: isExistingIdentity compare with Identity " + this.id + "\n");
 
-            identity = gAccountManager.getIdentity(this.id)
+            var identity = gAccountManager.getIdentity(this.id)
             if (this.__equalsIdentity(identity, ignoreFullName)) {
                 vI_notificationBar.dump("## vI_storage: existing Identity found: " + this.id + "\n");
@@ -209 +209 @@
     
     mergeWithoutDuplicates : function(addIdentityCollection) {
-        for (index = 0; index < addIdentityCollection.number; index++)
+        for (var index = 0; index < addIdentityCollection.number; index++)
             this.addWithoutDuplicates(
                 addIdentityCollection.emails[index],
@@ -220 +220 @@
 
     addWithoutDuplicates : function(email, fullName, combinedName, id_key, smtp_key, extras) {
-        for (index = 0; index < this.number; index++) {
+        for (var index = 0; index < this.number; index++) {
             if (this.emails[index] == email &&
                 (!this.id_keys[index] || !id_key || 
@@ -574 +574 @@
         if (recipientType != "addr_bcc" || !getCurrentIdentity().doBcc) return false
         var doBccArray = gMsgCompose.compFields.SplitRecipients(getCurrentIdentity().doBccList, false);
-        for ( var index = 0; index < doBccArray.count; index++ ) {
+        for (var index = 0; index < doBccArray.count; index++ ) {
             if (doBccArray.StringAt(index) == awGetInputElement(row).value) {
                 vI_notificationBar.dump("## vI_storage: ignoring doBcc field '" +

chrome/content/v_identity/vI_upgrade.js

@@ -23 +23 @@
  * ***** END LICENSE BLOCK ***** */
 
-vI_upgrade = {
+var vI_upgrade = {
     preferences : Components.classes["@mozilla.org/preferences-service;1"]
             .getService(Components.interfaces.nsIPrefService)
@@ -147 +147 @@
                         { sourcePref : "storage_ignore_smart_reply", targetPref : "idSelection_storage_ignore_smart_reply" }) }];
         // remove obsolete preference-tree virtualIdentity
-        for (i = 0; i < transferPrefs.length; i++) {
+        for (var i = 0; i < transferPrefs.length; i++) {
             // if former version of extension was at least 0.5.0, start with WizardPage 0.5.2
             if (!currentVersion || (vI_upgrade.versionChecker.compare(currentVersion, transferPrefs[i].version) < 0)) {
@@ -175 +175 @@
                     { version : "0.5.6", prefs : Array("copyEnigmailSettings") } ];
         // remove obsolete preference-tree virtualIdentity
-        for (i = 0; i < obsoletePrefs.length; i++) {
+        for (var i = 0; i < obsoletePrefs.length; i++) {
             // if former version of extension was at least 0.5.0, start with WizardPage 0.5.2
             if (!currentVersion || (vI_upgrade.versionChecker.compare(currentVersion, obsoletePrefs[i].version) < 0)) {

chrome/content/v_identity/v_identity.js

@@ -452 +452 @@
     {
         MenuItems = vI_msgIdentityClone.elements.Obj_MsgIdentity.firstChild.childNodes
-        for (index = 1; index <= MenuItems.length; index++) {
+        for (var index = 1; index <= MenuItems.length; index++) {
             if ( MenuItems[MenuItems.length - index].getAttribute("value") == vI_account.account.defaultIdentity.key )
                 vI_msgIdentityClone.elements.Obj_MsgIdentity.firstChild.removeChild(MenuItems[MenuItems.length - index])