Bug 639212 - Fix sidebar so it works with editor/messagecompose [bset is null]
authorIan Neal <iann_cvs@blueyonder.co.uk>
Sun, 06 Mar 2011 21:38:59 +0000
changeset 7264 e37c8c8ae90acd5867bac9fdaea246456acb43de
parent 7263 c40723287a1c084487a268bd9b146489e4124162
child 7265 4ba201da6c480c2aca420307d89ae56edd9ab39d
push idunknown
push userunknown
push dateunknown
bugs639212
Bug 639212 - Fix sidebar so it works with editor/messagecompose [bset is null] r=neil
editor/ui/composer/content/editor.xul
suite/debugQA/content/debugQATextEditorShell.xul
suite/mailnews/compose/messengercompose.xul
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@@ -118,16 +118,18 @@
   <observes element="dialog.start" attribute="ready" onbroadcast="EditorStartup('html')"/>
 -->
   <broadcasterset id="editorBroadcasters">
     <broadcaster id="Editor:Throbber" busy="false"/>
     <broadcaster id="Communicator:WorkMode"/>
     <broadcaster id="args" value="about:blank"/>
   </broadcasterset>
 
+  <broadcasterset id="mainBroadcasterSet"/>
+
   <!-- keys are appended from the overlay -->
   <keyset id="editorKeys">
     <keyset id="tasksKeys"/>
     <key id="showHideSidebar"/>
     <!-- eat these tab events here to stop focus from moving -->
     <key keycode="VK_TAB" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="shift" oncommand="return true;"/>
     <key keycode="VK_TAB" modifiers="control" oncommand="return true;"/>
--- a/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/suite/debugQA/content/debugQATextEditorShell.xul
@@ -95,16 +95,18 @@
 
   <!-- broadcaster nodes are appended here from the overlays -->
   <broadcasterset id="editorBroadcasters">
     <broadcaster id="Editor:Throbber" busy="false"/>
     <broadcaster id="args"
                  value="chrome://debugqa/content/EditorInitPagePlain.html"/>
   </broadcasterset>
 
+  <broadcasterset id="mainBroadcasterSet"/>
+
   <!-- keys are appended from the overlay -->
   <keyset id="editorKeys">
     <keyset id="tasksKeys"/>
     <key id="showHideSidebar"/>
   </keyset>
 
   <toolbox id="EditorToolbox">
     <menubar id="main-menubar" class="chromeclass-menubar">
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@@ -152,16 +152,18 @@
   <command id="cmd_CustomizeToolbars" oncommand="goCustomizeToolbar(getMailToolbox());"/>
 </commandset>
 
 <broadcasterset id="composeBroadcasters">
   <broadcaster id="Communicator:WorkMode"/>
   <broadcaster id="args" value="editorType=default"/>
 </broadcasterset>
 
+<broadcasterset id="mainBroadcasterSet"/>
+
 <keyset id="tasksKeys">
   <!-- File Menu -->
   <key id="key_close"/>
   <key id="key_save"  key="&saveCmd.key;" command="cmd_saveDefault" modifiers="accel"/>
   <key id="key_send" keycode="&sendCmd.keycode;" observes="cmd_sendWithCheck" modifiers="accel"/>
   <key id="key_sendLater" keycode="&sendLaterCmd.keycode;" observes="cmd_sendLater" modifiers="accel, shift"/>
   <key id="key_print"  key="&printCmd.key;" command="cmd_print" modifiers="accel"/>