Fix bug 678649 - Today pane in Lion won't expand. r=philipp,a=philipp
authorDecathlon <bv1578@gmail.com>
Thu, 29 Sep 2011 13:08:00 +0200
changeset 11032 42b1224f5087d2db2c2e1f931dc07fa33d41f149
parent 11031 64e08f18ee1bf97ad2851ce753096b466bf34975
child 11033 f7add7fc21a63f58914a5340382b3b2dbc6f71fc
push id6
push userbienvenu@nventure.com
push dateWed, 16 May 2012 22:24:51 +0000
treeherdertry-comm-central@ac395aea3008 [default view] [failures only]
reviewersphilipp, philipp
bugs678649
Fix bug 678649 - Today pane in Lion won't expand. r=philipp,a=philipp
calendar/base/content/today-pane.js
calendar/base/themes/pinstripe/today-pane.css
calendar/lightning/content/messenger-overlay-sidebar.xul
--- a/calendar/base/content/today-pane.js
+++ b/calendar/base/content/today-pane.js
@@ -304,19 +304,21 @@ var TodayPane = {
     },
 
     /**
      * Update the today-splitter state and today-pane width with saved
      * mode-dependent values.
      */
     updateSplitterState: function updateSplitterState() {
         let splitter = document.getElementById("today-splitter");
-        let todaypane = document.getElementById("today-pane-panel");
-        splitter.setAttribute("state", todaypane.isVisible() ? "open" : "collapsed");
-        setElementValue(splitter, !todaypane.isVisible() && "true", "hidden");
+        let todaypaneVisible = document.getElementById("today-pane-panel").isVisible();
+        setElementValue(splitter, !todaypaneVisible && "true", "hidden");
+        if (todaypaneVisible) {
+            splitter.setAttribute("state", "open");
+        }
     },
 
     /**
      * Generates the todaypane toggle command when the today-splitter
      * is being collapsed or uncollapsed.
      */
     onCommandTodaySplitter: function onCommandTodaySplitter() {
         let todaypane = document.getElementById("today-pane-panel");
--- a/calendar/base/themes/pinstripe/today-pane.css
+++ b/calendar/base/themes/pinstripe/today-pane.css
@@ -46,17 +46,16 @@
 
 #buttonspacer {
   width: 5px;
 }
 
 #today-pane-panel {
   background-color: -moz-Dialog;
   color: -moz-DialogText;
-  min-width: 100px;
 }
 
 #today-pane-panel:-moz-lwtheme {
   background-color: transparent;
   border-top: 1px solid ThreeDShadow;
 }
 
 #agenda-panel:-moz-lwtheme > vbox,
--- a/calendar/lightning/content/messenger-overlay-sidebar.xul
+++ b/calendar/lightning/content/messenger-overlay-sidebar.xul
@@ -573,17 +573,17 @@
           <vbox id="calendar-view-box"/>
         </deck>
       </hbox>
     </vbox>
   </tabpanels>
 
   <hbox id="tabmail-container">
     <splitter id="today-splitter"
-              collapse="none"
+              collapse="after"
               resizebefore="closest"
               state="collapsed"
               class="calendar-sidebar-splitter"
               oncommand="TodayPane.onCommandTodaySplitter();">
       <grippy/>
     </splitter>
     <modevbox id="today-pane-panel" />
   </hbox>