From e2c0d1a75d0c26c6fbdbac38f534df5d64a75fd2 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 2 Nov 2005 00:46:27 +0000
Subject: [PATCH] Patch to bug 121176 no longer works on trunk, trying to fix
 r=Mnyromyr rs=dmose

git-svn-id: svn://10.0.0.236/trunk@183372 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../mailnews/base/resources/content/commandglue.js | 14 +++-----------
 .../content/mail3PaneWindowVertLayout.xul          |  4 ++--
 .../mailnews/base/resources/content/messenger.xul  |  4 ++--
 .../mailnews/base/resources/content/widgetglue.js  |  3 +--
 4 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/commandglue.js b/mozilla/mailnews/base/resources/content/commandglue.js
index d4f9623de81..4f1ed00e8e8 100644
--- a/mozilla/mailnews/base/resources/content/commandglue.js
+++ b/mozilla/mailnews/base/resources/content/commandglue.js
@@ -784,7 +784,8 @@ function ChangeMessagePaneVisibility(now_hidden)
     // so we take it as it is
     gDBView.suppressMsgDisplay = now_hidden;
     // set the subject, uncollapsing won't automatically do this
-    gDBView.reloadMessage();
+    gDBView.loadMessageByUrl("about:blank");
+    gDBView.selectionChanged();
   }
   var event = document.createEvent('Events');
   if (now_hidden) {
@@ -796,20 +797,11 @@ function ChangeMessagePaneVisibility(now_hidden)
   document.getElementById("messengerWindow").dispatchEvent(event);
 }
 
-function OnMouseUpThreadAndMessagePaneSplitter()
+function OnClickThreadAndMessagePaneSplitter()
 {
-  // the collapsed state is the state after we released the mouse 
-  // so we take it as it is
   ChangeMessagePaneVisibility(IsMessagePaneCollapsed());
 }
 
-function OnClickThreadAndMessagePaneSplitterGrippy()
-{
-  // the collapsed state is the state when we clicked on the grippy
-  // not when afterwards, so we need to reverse this value
-  ChangeMessagePaneVisibility(!IsMessagePaneCollapsed());
-}
-
 function FolderPaneSelectionChange()
 {
     var folderTree = GetFolderTree();
diff --git a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
index 0dc835140b5..794896be76c 100644
--- a/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
+++ b/mozilla/mailnews/base/resources/content/mail3PaneWindowVertLayout.xul
@@ -168,8 +168,8 @@
 
     <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
     <splitter id="threadpane-splitter" collapse="after" persist="state hidden"
-              onmouseup="OnMouseUpThreadAndMessagePaneSplitter()">
-      <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
+              oncommand="OnClickThreadAndMessagePaneSplitter()">
+      <grippy/>
     </splitter>
 
     <vbox id="messagepanebox" flex="2" minheight="100" height="200" minwidth="100" width="200" persist="collapsed height width" class="window-focusborder" focusring="false">
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 0125c2e5cc2..c3a0857350e 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -166,8 +166,8 @@
 
         <!-- if you change this id, please change GetThreadAndMessagePaneSplitter() and MsgToggleMessagePane() -->
         <splitter id="threadpane-splitter" collapse="after" persist="state hidden"
-                  onmouseup="OnMouseUpThreadAndMessagePaneSplitter()">
-          <grippy onclick="OnClickThreadAndMessagePaneSplitterGrippy()"/>
+                  oncommand="OnClickThreadAndMessagePaneSplitter()">
+          <grippy/>
         </splitter>
 
         <vbox id="messagepanebox" flex="2" minheight="100" height="200" minwidth="100" width="200" persist="collapsed height width" class="window-focusborder" focusring="false">
diff --git a/mozilla/mailnews/base/resources/content/widgetglue.js b/mozilla/mailnews/base/resources/content/widgetglue.js
index cb005717d52..2fd126a4027 100644
--- a/mozilla/mailnews/base/resources/content/widgetglue.js
+++ b/mozilla/mailnews/base/resources/content/widgetglue.js
@@ -280,9 +280,8 @@ function FolderProperties(name, oldName, uri)
 
 function MsgToggleMessagePane()
 {
-  //OnClickThreadAndMessagePaneSplitter is based on the value before the splitter is toggled.
-  OnClickThreadAndMessagePaneSplitterGrippy();
   MsgToggleSplitter("threadpane-splitter");
+  OnClickThreadAndMessagePaneSplitter();
 }
 
 function MsgToggleSplitter(id)