Backout Bug 674246 - Workaround event handler having the same original prototype node r=neil

2013-01-02 12:24:06 +00:00 · 2013-01-02 12:24:06 +00:00 · 3607fd8c3c
--- a/editor/ui/composer/content/editor.xul
+++ b/editor/ui/composer/content/editor.xul
@ -54,9 +54,7 @@
  <script type="application/javascript" src="chrome://global/content/printUtils.js"/>
  <script type="application/javascript" src="chrome://global/content/nsDragAndDrop.js"/>

-  <popupset id="contentAreaContextSet">
-    <menupopup id="contentAreaContextMenu"/>
-  </popupset>
+  <popupset id="contentAreaContextSet"/>
  <menupopup id="structToolbarContext"/>
  <menupopup id="sidebarPopup"/>
  <menupopup id="popupNotificationMenu"/>
--- a/suite/mailnews/compose/messengercompose.xul
+++ b/suite/mailnews/compose/messengercompose.xul
@ -151,9 +151,7 @@
  <key id="key_renameAttachment"/>
 </keyset>

-  <popupset id="contentAreaContextSet">
-    <menupopup id="contentAreaContextMenu"/>
-  </popupset>
+  <popupset id="contentAreaContextSet"/>

  <popupset id="msgComposePopupSet">
    <menupopup id="sidebarPopup"/>