diff --git a/suite/mailnews/compose/addressingWidgetOverlay.js b/suite/mailnews/compose/addressingWidgetOverlay.js index 119361f5e7..b8bed1029d 100644 --- a/suite/mailnews/compose/addressingWidgetOverlay.js +++ b/suite/mailnews/compose/addressingWidgetOverlay.js @@ -127,7 +127,7 @@ function Recipients2CompFields(msgCompFields) case "addr_to" : addrTo += to_Sep + recipient; to_Sep = ","; break; case "addr_cc" : addrCc += cc_Sep + recipient; cc_Sep = ","; break; case "addr_bcc" : addrBcc += bcc_Sep + recipient; bcc_Sep = ","; break; - case "addr_reply" : addrReply += reply_Sep + recipient; reply_Sep = ","; break; + case "addr_reply" : addrReply += reply_Sep + recipient; reply_Sep = ","; break; case "addr_newsgroups" : addrNg += ng_Sep + fieldValue; ng_Sep = ","; break; case "addr_followup" : addrFollow += follow_Sep + fieldValue; follow_Sep = ","; break; case "addr_other": @@ -163,7 +163,7 @@ function CompFields2Recipients(msgCompFields) var templateNode = listbox.getElementsByTagName("listitem")[0]; // dump("replacing child in comp fields 2 recips \n"); listbox.parentNode.replaceChild(newListBoxNode, listbox); - + top.MAX_RECIPIENTS = 0; var msgReplyTo = msgCompFields.replyTo; var msgTo = msgCompFields.to; @@ -204,7 +204,7 @@ function CompFields2Recipients(msgCompFields) awFitDummyRows(2); // CompFields2Recipients is called whenever a user replies or edits an existing message. - // We want to add all of the recipients for this message to the ignore list for spell check + // We want to add all of the recipients for this message to the ignore list for spell check addRecipientsToIgnoreList((gCurrentIdentity ? gCurrentIdentity.identityName + ', ' : '') + msgTo + ', ' + msgCC + ', ' + msgBCC); } } @@ -310,12 +310,12 @@ function awAddRecipient(recipientType, address) if (awGetInputElement(row).value == "") break; } - + if (row > top.MAX_RECIPIENTS) awAppendNewRow(false); awSetInputAndPopupValue(awGetInputElement(row), address, awGetPopupElement(row), recipientType, row); - + /* be sure we still have an empty row left at the end */ if (row == top.MAX_RECIPIENTS) { @@ -531,7 +531,7 @@ function awAppendNewRow(setFocus) var select = newNode.getElementsByTagName(awSelectElementName()); if ( select && select.length == 1 ) { - // It only makes sense to clone some field types; others + // It only makes sense to clone some field types; others // should not be cloned, since it just makes the user have // to go to the trouble of selecting something else. In such // cases let's default to 'To' (a reasonable default since @@ -542,7 +542,7 @@ function awAppendNewRow(setFocus) case "addr_reply": case "addr_other": select[0].selectedIndex = awGetSelectItemIndex("addr_to"); - break; + break; case "addr_followup": select[0].selectedIndex = awGetSelectItemIndex("addr_newsgroups"); break; @@ -550,7 +550,7 @@ function awAppendNewRow(setFocus) // e.g. "addr_to","addr_cc","addr_bcc","addr_newsgroups": select[0].selectedIndex = awGetSelectItemIndex(lastRecipientType); } - + awSetInputAndPopupId(input[0], select[0], top.MAX_RECIPIENTS); if (input) @@ -721,7 +721,7 @@ function awRecipientTextCommand(userAction, element) // Called when an autocomplete session item is selected and the status of // the session it was selected from is nsIAutoCompleteStatus::failureItems. // -// As of this writing, the only way that can happen is when an LDAP +// As of this writing, the only way that can happen is when an LDAP // autocomplete session returns an error to be displayed to the user. // // There are hardcoded messages in here, but these are just fallbacks for @@ -729,7 +729,7 @@ function awRecipientTextCommand(userAction, element) // function awRecipientErrorCommand(errItem, element) { - // remove the angle brackets from the general error message to construct + // remove the angle brackets from the general error message to construct // the title for the alert. someday we'll pass this info using a real // exception object, and then this code can go away. // @@ -738,12 +738,12 @@ function awRecipientErrorCommand(errItem, element) generalErrString = errItem.value.slice(1, errItem.value.length-1); } else { generalErrString = "Unknown LDAP server problem encountered"; - } + } // try and get the string of the specific error to contruct the complete // err msg, otherwise fall back to something generic. This message is - // handed to us as an nsISupportsString in the param slot of the - // autocomplete error item, by agreement documented in + // handed to us as an nsISupportsString in the param slot of the + // autocomplete error item, by agreement documented in // nsILDAPAutoCompFormatter.idl // var specificErrString = ""; @@ -771,7 +771,7 @@ function awRecipientKeyPress(event, element) break; case KeyEvent.DOM_VK_RETURN: case KeyEvent.DOM_VK_TAB: - // if the user text contains a comma or a line return, ignore + // if the user text contains a comma or a line return, ignore if (element.value.search(',') != -1) { var addresses = element.value; @@ -780,7 +780,7 @@ function awRecipientKeyPress(event, element) } else if (event.keyCode == KeyEvent.DOM_VK_TAB) awTabFromRecipient(element, event); - + break; } } @@ -971,8 +971,8 @@ function awDocumentKeyPress(event) function awRecipientInputCommand(event, inputElement) { - gContentChanged=true; - setupAutocomplete(); + gContentChanged=true; + setupAutocomplete(); } // Given an arbitrary block of text like a comma delimited list of names or a names separated by spaces, @@ -1006,8 +1006,8 @@ function AutomatedAutoCompleteHandler() { } -// state driven self contained object which will autocomplete a block of addresses without any UI. -// force picks the first match and adds it to the addressing widget, then goes on to the next +// state driven self contained object which will autocomplete a block of addresses without any UI. +// force picks the first match and adds it to the addressing widget, then goes on to the next // name to complete. AutomatedAutoCompleteHandler.prototype = @@ -1049,7 +1049,7 @@ AutomatedAutoCompleteHandler.prototype = if (this.namesToComplete[this.indexIntoNames].search('@') == -1) // don't autocomplete if address has an @ sign in it { // make sure total session count is updated before we kick off ANY actual searches - if (gAutocompleteSession) + if (gAutocompleteSession) this.numSessionsToSearch++; if (gLDAPSession && gCurrentAutocompleteDirectory) @@ -1080,17 +1080,17 @@ AutomatedAutoCompleteHandler.prototype = } }, - onStatus:function(aStatus) + onStatus:function(aStatus) { return; }, - - onAutoComplete: function(aResults, aStatus) + + onAutoComplete: function(aResults, aStatus) { // store the results until all sessions are done and have reported in if (aResults) this.searchResults[this.numSessionsSearched] = aResults; - + this.numSessionsSearched++; // bump our counter if (this.numSessionsToSearch <= this.numSessionsSearched) @@ -1103,7 +1103,7 @@ AutomatedAutoCompleteHandler.prototype = var addressToAdd; // loop through the results looking for the non default case (default case is the address book with only one match, the default domain) - var sessionIndex; + var sessionIndex; var searchResultsForSession; @@ -1136,8 +1136,8 @@ AutomatedAutoCompleteHandler.prototype = addressToAdd = this.namesToComplete[this.indexIntoNames]; // that will automatically set the focus on a new available row, and make sure it is visible - awAddRecipient(this.recipientType ? this.recipientType : "addr_to", addressToAdd); - + awAddRecipient(this.recipientType ? this.recipientType : "addr_to", addressToAdd); + this.indexIntoNames++; this.autoCompleteNextAddress(); }, diff --git a/suite/mailnews/mailWidgets.xml b/suite/mailnews/mailWidgets.xml index f5fec360f4..84b15aed1e 100644 --- a/suite/mailnews/mailWidgets.xml +++ b/suite/mailnews/mailWidgets.xml @@ -1235,9 +1235,9 @@ } // if it's not sender, to, cc, alladdresses, or toorcc, we don't care - if (this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.Sender && - this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.To && - this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.ToOrCC && + if (this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.Sender && + this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.To && + this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.ToOrCC && this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.AllAddresses && this.searchAttribute != Components.interfaces.nsMsgSearchAttrib.CC ) { this.internalOperator = val; @@ -1367,7 +1367,7 @@ children[0].value = val.age; else if (attrib == nsMsgSearchAttrib.Date) children[3].value = convertPRTimeToString(val.date); - else if (attrib == nsMsgSearchAttrib.Sender || + else if (attrib == nsMsgSearchAttrib.Sender || attrib == nsMsgSearchAttrib.To || attrib == nsMsgSearchAttrib.CC || attrib == nsMsgSearchAttrib.AllAddresses || diff --git a/suite/mailnews/msgHdrViewOverlay.js b/suite/mailnews/msgHdrViewOverlay.js index 4c73260b97..0237b0c50a 100644 --- a/suite/mailnews/msgHdrViewOverlay.js +++ b/suite/mailnews/msgHdrViewOverlay.js @@ -179,7 +179,7 @@ function initializeHeaderViewTables() // for each one. These header entries are then stored in the appropriate header table for (let index = 0; index < gCollapsedHeaderList.length; index++) { - gCollapsedHeaderView[gCollapsedHeaderList[index].name] = + gCollapsedHeaderView[gCollapsedHeaderList[index].name] = new createHeaderEntry('collapsed', gCollapsedHeaderList[index]); } @@ -248,7 +248,7 @@ function OnLoadMsgHeaderPane() var toggleHeaderView = GetHeaderPane(); var initialCollapsedSetting = toggleHeaderView.getAttribute("state"); if (initialCollapsedSetting == "true") - gCollapsedHeaderViewMode = true; + gCollapsedHeaderViewMode = true; // dispatch an event letting any listeners know that we have loaded the message pane toggleHeaderView.dispatchEvent(new Event('messagepane-loaded', @@ -472,7 +472,7 @@ var messageHeaderSink = { var createCard = (gCollectIncoming && !dontCollectAddress) || (gCollectNewsgroup && dontCollectAddress); if (createCard || gCollectOutgoing) { - // collect, add card if doesn't exist and gCollectOutgoing is set, + // collect, add card if doesn't exist and gCollectOutgoing is set, // otherwise only update existing cards, unknown preferred send format gCollectAddressTimer = setTimeout(collectAddresses, 2000, @@ -729,7 +729,7 @@ function collectAddresses(aAddresses, aCreateCard) } // Public method called by the tag front end code when the tags for the selected -// message has changed. +// message has changed. function OnTagsChange() { // rebuild the tag headers @@ -823,7 +823,7 @@ function ToggleHeaderView() hideHeaderView(gCollapsedHeaderView); // update the current view UpdateMessageHeaders(); - + // now uncollapse / collapse the right views expandedNode.collapsed = false; collapsedNode.collapsed = true; @@ -835,11 +835,11 @@ function ToggleHeaderView() hideHeaderView(gExpandedHeaderView); // update the current view UpdateMessageHeaders(); - + // now uncollapse / collapse the right views collapsedNode.collapsed = false; expandedNode.collapsed = true; - } + } var toggleHeaderView = GetHeaderPane(); if (gCollapsedHeaderViewMode) @@ -922,9 +922,9 @@ function UpdateMessageHeaders() } } catch (ex) {} } - + if (gCollapsedHeaderViewMode && !gBuiltCollapsedView) - { + { if (headerName in gCollapsedHeaderView) headerEntry = gCollapsedHeaderView[headerName]; } @@ -960,7 +960,7 @@ function UpdateMessageHeaders() { // hide references header if view all headers mode isn't selected, the pref show references is // deactivated and the currently displayed message isn't a newsgroup posting - headerEntry.valid = false; + headerEntry.valid = false; } else { @@ -997,7 +997,7 @@ function ShowMessageHeaderPane() { var node; if (gCollapsedHeaderViewMode) - { + { node = document.getElementById("collapsedHeaderView"); if (node) node.collapsed = false; @@ -1010,11 +1010,11 @@ function ShowMessageHeaderPane() } /* workaround for 39655 */ - if (gFolderJustSwitched) + if (gFolderJustSwitched) { let el = GetHeaderPane(); el.setAttribute("style", el.getAttribute("style")); - gFolderJustSwitched = false; + gFolderJustSwitched = false; } document.commandDispatcher.updateCommands("message-header-pane"); @@ -1098,7 +1098,7 @@ function OutputEmailAddresses(headerEntry, emailAddresses) index++; } - + if (headerEntry.useToggle) headerEntry.enclosingBox.buildViews(); } // if msgheader parser @@ -1541,7 +1541,7 @@ function attachmentListClick(event) } // on command handlers for the attachment list context menu... -// commandPrefix matches one of our existing functions +// commandPrefix matches one of our existing functions // (openAttachment, saveAttachment, etc.) function handleAttachmentSelection(commandPrefix) { @@ -1581,7 +1581,7 @@ function displayAttachmentsForExpandedView() nameAndSize += " (" + messenger.formatFileSize(attachment.size) + ")"; let item = attachmentList.appendItem(nameAndSize, ""); item.setAttribute("crop", "center"); - item.setAttribute("class", "listitem-iconic attachment-item"); + item.setAttribute("class", "listitem-iconic attachment-item"); item.setAttribute("tooltiptext", attachment.displayName); item.attachment = attachment; item.setAttribute("attachmentUrl", attachment.url); @@ -1592,11 +1592,11 @@ function displayAttachmentsForExpandedView() item.setAttribute('disabled', 'true'); else setApplicationIconForAttachment(attachment, item); - } // for each attachment + } // for each attachment gBuildAttachmentsForCurrentMsg = true; } - + var expandedAttachmentBox = document.getElementById('expandedAttachmentBox'); expandedAttachmentBox.collapsed = numAttachments <= 0; } @@ -1710,7 +1710,7 @@ function FillAttachmentItemPopup(event) openpopup.removeEventListener('popupshowing', FillAttachmentItemPopup, false); var menuitementry = document.getElementById("context-openAttachment").cloneNode(false); - menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.openAttachment();'); + menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.openAttachment();'); menuitementry = openpopup.appendChild(menuitementry); menuitementry = document.getElementById("context-viewAttachment").cloneNode(false); @@ -1718,23 +1718,23 @@ function FillAttachmentItemPopup(event) menuitementry = openpopup.appendChild(menuitementry); menuitementry = document.getElementById("context-saveAttachment").cloneNode(false); - menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.saveAttachment()'); + menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.saveAttachment()'); menuitementry = openpopup.appendChild(menuitementry); openpopup.appendChild(document.createElement("menuseparator")); menuitementry = document.getElementById("context-detachAttachment").cloneNode(false); - menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.detachAttachment()'); + menuitementry.setAttribute('oncommand', 'this.parentNode.attachment.detachAttachment()'); if (!canDetach) menuitementry.setAttribute('disabled', 'true'); menuitementry = openpopup.appendChild(menuitementry); menuitementry = document.getElementById("context-deleteAttachment").cloneNode(false); - menuitementry.setAttribute('oncommand', 'this.attachment.deleteAttachment()'); + menuitementry.setAttribute('oncommand', 'this.attachment.deleteAttachment()'); if (!canDetach) menuitementry.setAttribute('disabled', 'true'); menuitementry = openpopup.appendChild(menuitementry); -} +} function HandleMultipleAttachments(commandPrefix, selectedAttachments) { @@ -1975,7 +1975,7 @@ nsDummyMsgHeader.prototype = recipients : null, from : null, subject : "", - get mime2DecodedSubject() { return this.subject; }, + get mime2DecodedSubject() { return this.subject; }, ccList : null, messageId : null, listPost : null,