Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-03-04 07:40:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix history navigation in standalone message window, sr=mscott, 74959

Browse Source
This commit is contained in:
bienvenu%nventure.com 2006-08-22 21:58:39 +00:00
parent dc2e565d35
commit ebd97c3b06
1 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
mail/base/content/messageWindow.js
View File

@ -176,6 +176,8 @@ nsMsgDBViewCommandUpdater.prototype =
gCurrentMessageUri = gDBView.URIForFirstSelectedMessage; gCurrentMessageUri = gDBView.URIForFirstSelectedMessage;
UpdateStandAloneMessageCounts(); UpdateStandAloneMessageCounts();
goUpdateCommand("button_junk"); goUpdateCommand("button_junk");
goUpdateCommand("button_goBack");
goUpdateCommand("button_goForward");
}, },
updateNextMessageAfterDelete : function() updateNextMessageAfterDelete : function()
@ -782,6 +784,8 @@ var MessageWindowController =
case "cmd_previousFlaggedMsg": case "cmd_previousFlaggedMsg":
case "cmd_goForward": case "cmd_goForward":
case "cmd_goBack": case "cmd_goBack":
case "button_goForward":
case "button_goBack":
return !(gDBView.keyForFirstSelectedMessage == nsMsgKey_None); return !(gDBView.keyForFirstSelectedMessage == nsMsgKey_None);
case "cmd_reply": case "cmd_reply":
@ -903,6 +907,14 @@ var MessageWindowController =
case "cmd_goForward": case "cmd_goForward":
case "cmd_goBack": case "cmd_goBack":
return true; return true;
case "button_goForward":
case "button_goBack":
case "cmd_goForward":
case "cmd_goBack":
return gDBView &&
gDBView.navigateStatus((command == "cmd_goBack" ||
command == "button_goBack")
? nsMsgNavigationType.back : nsMsgNavigationType.forward);
case "cmd_search": case "cmd_search":
var loadedFolder = GetLoadedMsgFolder(); var loadedFolder = GetLoadedMsgFolder();
if (!loadedFolder) if (!loadedFolder)
@ -928,24 +940,24 @@ var MessageWindowController =
var navigationType = nsMsgNavigationType.nextUnreadMessage; var navigationType = nsMsgNavigationType.nextUnreadMessage;
switch ( command ) switch ( command )
{ {
case "cmd_close": case "cmd_close":
CloseMailWindow(); CloseMailWindow();
break; break;
case "cmd_getNewMessages": case "cmd_getNewMessages":
MsgGetMessage(); MsgGetMessage();
break; break;
case "cmd_undo": case "cmd_undo":
messenger.Undo(msgWindow); messenger.Undo(msgWindow);
break; break;
case "cmd_redo": case "cmd_redo":
messenger.Redo(msgWindow); messenger.Redo(msgWindow);
break; break;
case "cmd_getMsgsForAuthAccounts": case "cmd_getMsgsForAuthAccounts":
MsgGetMessagesForAllAuthenticatedAccounts(); MsgGetMessagesForAllAuthenticatedAccounts();
break; break;
case "cmd_getNextNMessages": case "cmd_getNextNMessages":
MsgGetNextNMessages(); MsgGetNextNMessages();
break; break;
case "cmd_reply": case "cmd_reply":
@ -1063,7 +1075,7 @@ var MessageWindowController =
case "button_next": case "button_next":
performNavigation(nsMsgNavigationType.nextUnreadMessage); performNavigation(nsMsgNavigationType.nextUnreadMessage);
break; break;
case "cmd_nextUnreadThread": case "cmd_nextUnreadThread":
performNavigation(nsMsgNavigationType.nextUnreadThread); performNavigation(nsMsgNavigationType.nextUnreadThread);
break; break;
case "cmd_nextMsg": case "cmd_nextMsg":
@ -1076,19 +1088,19 @@ var MessageWindowController =
performNavigation(nsMsgNavigationType.previousMessage); performNavigation(nsMsgNavigationType.previousMessage);
break; break;
case "button_previous": case "button_previous":
case "cmd_previousUnreadMsg": case "cmd_previousUnreadMsg":
performNavigation(nsMsgNavigationType.previousUnreadMessage); performNavigation(nsMsgNavigationType.previousUnreadMessage);
break; break;
case "cmd_previousFlaggedMsg": case "cmd_previousFlaggedMsg":
performNavigation(nsMsgNavigationType.previousFlagged); performNavigation(nsMsgNavigationType.previousFlagged);
break; break;
case "cmd_goForward": case "cmd_goForward":
performNavigation(nsMsgNavigationType.forward); performNavigation(nsMsgNavigationType.forward);
break; break;
case "cmd_goBack": case "cmd_goBack":
performNavigation(nsMsgNavigationType.back); performNavigation(nsMsgNavigationType.back);
break; break;
} }
}, },
onEvent: function(event) onEvent: function(event)