Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More fixes for js warnings and fix for Netscape bug 1793. r=mscott

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@78523 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
putterman%netscape.com
2000-09-08 21:57:43 +00:00
parent 151365444a
commit 4e970d7ea9
6 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
mozilla/mailnews/base/resources/content/mail3PaneWindowCommands.js
View File

@@ -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();

4
mozilla/mailnews/base/resources/content/mailWindow.js
View File

@@ -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");

10
mozilla/mailnews/base/resources/content/mailWindowOverlay.js
View File

@@ -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);

12
mozilla/mailnews/base/resources/content/msgMail3PaneWindow.js
View File

@@ -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);

6
mozilla/mailnews/base/resources/content/threadPane.xul
View File

@@ -109,13 +109,13 @@ Rights Reserved.
<treehead>
<treerow id="headRow">
<treecell display="Thread" onclick="return top.ChangeThreadView();" class="treecell-header treecell-inset-header treecell-header-image threadColumnHeader" tooltip="aTooltip" tooltiptext="&threadColumnHeader.tooltip;" id="ThreadColumnHeader"/>
<treecell display="&threadColumn.label;" onclick="return top.ChangeThreadView();" class="treecell-header treecell-inset-header treecell-header-image threadColumnHeader" tooltip="aTooltip" tooltiptext="&threadColumnHeader.tooltip;" id="ThreadColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&subjectColumn.label;" onclick="return top.MsgSortBySubject();" id="SubjectColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" onclick="return top.MsgSortBySender();" value="&senderColumn.label;" id="SenderColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header readColumnHeader" display="Read" onclick="return top.MsgSortByRead();" id="UnreadButtonColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header readColumnHeader" display="&readColumn.label;" onclick="return top.MsgSortByRead();" id="UnreadButtonColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&dateColumn.label;" onclick="return top.MsgSortByDate();" id="DateColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&priorityColumn.label;" onclick="return top.MsgSortByPriority();" id="PriorityColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header flagColumnHeader" display="Flag" onclick="return top.MsgSortByFlagged();" id="FlaggedButtonColumnHeader"/>
<treecell class="treecell-header treecell-header-image treecell-inset-header flagColumnHeader" display="&flagColumn.label;" onclick="return top.MsgSortByFlagged();" id="FlaggedButtonColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&statusColumn.label;" onclick="return top.MsgSortByStatus();" id="StatusColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&sizeColumn.label;" onclick="return top.MsgSortBySize();" id="SizeColumnHeader"/>
<treecell class="treecell-header treecell-inset-header sortDirectionIndicator" value="&unreadColumn.label;" onclick="return top.MsgSortByUnread();" id="UnreadColumnHeader"/>

2
mozilla/mailnews/base/resources/locale/en-US/threadpane.dtd
View File

@@ -28,6 +28,8 @@ Rights Reserved.
<!ENTITY unreadColumn.label "Unread">
<!ENTITY totalColumn.label "Total">
<!ENTITY orderReceivedColumn.label "Order Received">
<!ENTITY readColumn.label "Read">
<!ENTITY flagColumn.label "Flag">
<!--Tooltips-->
<!ENTITY threadColumnHeader.tooltip "Click to display message threads">