Bug 832679 - Let 'Folder Pane' and 'Message Pane' in AppMenu work correctly. r=mconley
authorRichard Marti <richard.marti@gmail.com>
Sun, 20 Jan 2013 09:26:28 +0100
changeset 14865 d747857f2d0d86ada00cc830574106cff6aedad0
parent 14864 4999a8cba27ed17c9301ea3a36b949c24997062f
child 14866 92fce13b87d4e7844c618fe238460cf113821b7e
push id867
push userbugzilla@standard8.plus.com
push dateMon, 01 Apr 2013 20:44:27 +0000
treeherdercomm-beta@797726b8d244 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmconley
bugs832679
Bug 832679 - Let 'Folder Pane' and 'Message Pane' in AppMenu work correctly. r=mconley
mail/base/content/mailWindowOverlay.js
--- a/mail/base/content/mailWindowOverlay.js
+++ b/mail/base/content/mailWindowOverlay.js
@@ -167,21 +167,33 @@ function view_init()
   let accountCentralDisplayed = gFolderDisplay.isAccountCentralDisplayed;
   let messagePaneMenuItem = document.getElementById("menu_showMessage");
   if (!messagePaneMenuItem.hidden) { // Hidden in the standalone msg window.
     messagePaneMenuItem.setAttribute("checked",
       accountCentralDisplayed ? false : gMessageDisplay.visible);
     messagePaneMenuItem.disabled = accountCentralDisplayed;
   }
 
+  let messagePaneAppMenuItem = document.getElementById("appmenu_showMessage");
+  if (!messagePaneAppMenuItem.hidden) { // Hidden in the standalone msg window.
+    messagePaneAppMenuItem.setAttribute("checked",
+      accountCentralDisplayed ? false : gMessageDisplay.visible);
+    messagePaneAppMenuItem.disabled = accountCentralDisplayed;
+  }
+
   let folderPaneMenuItem = document.getElementById("menu_showFolderPane");
   if (!folderPaneMenuItem.hidden) { // Hidden in the standalone msg window.
     folderPaneMenuItem.setAttribute("checked", gFolderDisplay.folderPaneVisible);
   }
 
+  let folderPaneAppMenuItem = document.getElementById("appmenu_showFolderPane");
+  if (!folderPaneAppMenuItem.hidden) { // Hidden in the standalone msg window.
+    folderPaneAppMenuItem.setAttribute("checked", gFolderDisplay.folderPaneVisible);
+  }
+
   // Disable some menus if account manager is showing
   document.getElementById("viewSortMenu").disabled = accountCentralDisplayed;
 
   let appmenuViewSort = document.getElementById("appmenu_viewSortMenu");
   if (appmenuViewSort)
     appmenuViewSort.disabled = accountCentralDisplayed;
 
   document.getElementById("viewMessageViewMenu").disabled = accountCentralDisplayed;