From 4e970d7ea9572f220c05c680fe83884440f4bdd2 Mon Sep 17 00:00:00 2001 From: "putterman%netscape.com" Date: Fri, 8 Sep 2000 21:57:43 +0000 Subject: [PATCH] More fixes for js warnings and fix for Netscape bug 1793. r=mscott git-svn-id: svn://10.0.0.236/trunk@78523 18797224-902f-48f8-a5cc-f745e15eee43 --- .../resources/content/mail3PaneWindowCommands.js | 11 +++++++---- .../mailnews/base/resources/content/mailWindow.js | 4 ++-- .../base/resources/content/mailWindowOverlay.js | 10 ++++++---- .../base/resources/content/msgMail3PaneWindow.js | 12 +++++++----- .../mailnews/base/resources/content/threadPane.xul | 6 +++--- .../base/resources/locale/en-US/threadpane.dtd | 2 ++ 6 files changed, 27 insertions(+), 18 deletions(-) diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js b/mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js index 2cb1faf6e1f..094f3612f27 100644 --- a/mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js +++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js @@ -867,11 +867,14 @@ function SetTemplateTreeItemOpen(open) function SwitchPaneFocus(event) { + var focusedElement; + var focusedElementId; + if (event && (event.shiftKey)) { dump("Inside the SwitchPaneFocus \n"); - var focusedElement = document.commandDispatcher.focusedElement; - var focusedElementId=""; + focusedElement = document.commandDispatcher.focusedElement; + focusedElementId=""; if ( MessagePaneHasFocus() ) SetFocusThreadPane(); @@ -894,8 +897,8 @@ function SwitchPaneFocus(event) else { dump("Inside the SwitchPaneFocus \n"); - var focusedElement = document.commandDispatcher.focusedElement; - var focusedElementId=""; + focusedElement = document.commandDispatcher.focusedElement; + focusedElementId=""; if ( MessagePaneHasFocus() ) SetFocusFolderPane(); diff --git a/mozilla/mailnews/base/resources/content/mailWindow.js b/mozilla/mailnews/base/resources/content/mailWindow.js index 4c085d9f515..37ca779877d 100644 --- a/mozilla/mailnews/base/resources/content/mailWindow.js +++ b/mozilla/mailnews/base/resources/content/mailWindow.js @@ -318,10 +318,10 @@ function StopUrls() function loadStartPage() { try { - startpageenabled= pref.GetBoolPref("mailnews.start_page.enabled"); + var startpageenabled= pref.GetBoolPref("mailnews.start_page.enabled"); if (startpageenabled) { - startpage = pref.CopyCharPref("mailnews.start_page.url"); + var startpage = pref.CopyCharPref("mailnews.start_page.url"); if (startpage != "") { window.frames["messagepane"].location = startpage; dump("start message pane with: " + startpage + "\n"); diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js index 4a4d8a688a5..dbdf4d3d72a 100644 --- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js +++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js @@ -44,7 +44,7 @@ function InitViewMessagesMenu() allMenuItem.setAttribute("checked", messageView.viewType == viewShowAll); var unreadMenuItem = document.getElementById("viewUnreadMessagesMenuItem"); - var hidden = unreadMenuItem.getAttribute("hidden") == "true"; + hidden = unreadMenuItem.getAttribute("hidden") == "true"; if(unreadMenuItem && !hidden) unreadMenuItem.setAttribute("checked", messageView.viewType == viewShowUnread); @@ -332,7 +332,7 @@ function MsgForwardMessage(event) dump("\nMsgForwardMessage from XUL\n"); var forwardType = 0; try { - var forwardType = pref.GetIntPref("mail.forward_message_mode"); + forwardType = pref.GetIntPref("mail.forward_message_mode"); } catch (e) {dump ("failed to retrieve pref mail.forward_message_mode");} if (forwardType == 0) @@ -441,16 +441,18 @@ function MsgOpenNewWindowForFolder(folderUri) function MsgOpenNewWindowForMessage(messageUri, folderUri) { + var message; + if(!messageUri) { - var message = GetLoadedMessage(); + message = GetLoadedMessage(); var messageResource = message.QueryInterface(Components.interfaces.nsIRDFResource); messageUri = messageResource.Value; } if(!folderUri) { - var message = RDF.GetResource(messageUri); + message = RDF.GetResource(messageUri); message = message.QueryInterface(Components.interfaces.nsIMessage); var folder = message.msgFolder; var folderResource = folder.QueryInterface(Components.interfaces.nsIRDFResource); diff --git a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js index 78235c38b50..0c6bd5b141a 100644 --- a/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js +++ b/mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js @@ -590,6 +590,8 @@ function FolderPaneOnClick(event) debug("in FolderPaneClick()\n"); var t = event.originalTarget; + var item; + var uri; if (t.getAttribute('twisty') == 'true') { // The twisty is nested three below the treeitem: @@ -602,11 +604,11 @@ function FolderPaneOnClick(event) if(open == "true") { //dump("twisty open\n"); - var item = t.parentNode.parentNode.parentNode; + item = t.parentNode.parentNode.parentNode; if (item.localName == "treeitem") { var isServer = (treeitem.getAttribute('IsServer') == "true"); if (isServer) { - var uri = treeitem.getAttribute("id"); + uri = treeitem.getAttribute("id"); var server = GetServer(uri); if (server) { server.PerformExpand(msgWindow); @@ -615,7 +617,7 @@ function FolderPaneOnClick(event) else { var isImap = (treeitem.getAttribute('ServerType') == "imap"); if (isImap) { - var uri = treeitem.getAttribute("id"); + uri = treeitem.getAttribute("id"); var folder = GetMsgFolderFromUri(uri); if (folder) { var imapFolder = folder.QueryInterface(Components.interfaces.nsIMsgImapMailFolder); @@ -630,7 +632,7 @@ function FolderPaneOnClick(event) } else if(event.detail == 2) { - var item = t.parentNode.parentNode; + item = t.parentNode.parentNode; if (item.localName == "treeitem") FolderPaneDoubleClick(item); } @@ -876,7 +878,7 @@ function SetBusyCursor(window, enable) else window.setCursor("auto"); - numFrames = window.frames.length; + var numFrames = window.frames.length; for(var i = 0; i < numFrames; i++) { SetBusyCursor(window.frames[i], enable); diff --git a/mozilla/mailnews/base/resources/content/threadPane.xul b/mozilla/mailnews/base/resources/content/threadPane.xul index d617ae75782..49746b64aec 100644 --- a/mozilla/mailnews/base/resources/content/threadPane.xul +++ b/mozilla/mailnews/base/resources/content/threadPane.xul @@ -109,13 +109,13 @@ Rights Reserved. - + - + - + diff --git a/mozilla/mailnews/base/resources/locale/en-US/threadpane.dtd b/mozilla/mailnews/base/resources/locale/en-US/threadpane.dtd index c1b48e3579d..2fa5afc54db 100644 --- a/mozilla/mailnews/base/resources/locale/en-US/threadpane.dtd +++ b/mozilla/mailnews/base/resources/locale/en-US/threadpane.dtd @@ -28,6 +28,8 @@ Rights Reserved. + +