Bug 1265181 - Backed out changeset eb8f339d7d06 due to wrong apply order. a=jorgk DONTBUILD
authorJorg K
Sun, 17 Apr 2016 14:16:58 +0200
changeset 24485 b46542f375b67505195ceb309059aad949d34fcc
parent 24484 2e7e0003fcf7bd8e669f0eed929ebc58dc45674b
child 24486 e67c3b9a615888243ea04d0e1d6d833fb657bda9
push id1623
push userclokep@gmail.com
push dateMon, 25 Apr 2016 14:53:28 +0000
treeherdercomm-beta@25267c20666e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk
bugs1265181
Bug 1265181 - Backed out changeset eb8f339d7d06 due to wrong apply order. a=jorgk DONTBUILD
editor/ui/composer/content/editorOverlay.xul
mail/components/compose/content/editorOverlay.xul
--- a/editor/ui/composer/content/editorOverlay.xul
+++ b/editor/ui/composer/content/editorOverlay.xul
@@ -414,31 +414,28 @@
                   value="tt"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuseparator id="fontFaceMenuAfterGenericFontsSeparator"/>
         <menuitem id="menu_fontFaceHelvetica"
                   label="&fontHelvetica.label;"
                   accesskey="&fontHelvetica.accesskey;"
                   value="Helvetica, Arial, sans-serif"
-                  value_parsed="helvetica,arial,sans-serif"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuitem id="menu_fontFaceTimes"
                   label="&fontTimes.label;"
                   accesskey="&fontTimes.accesskey;"
                   value="Times New Roman, Times, serif"
-                  value_parsed="times new roman,times,serif"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuitem id="menu_fontFaceCourier"
                   label="&fontCourier.label;"
                   accesskey="&fontCourier.accesskey;"
                   value="Courier New, Courier, monospace"
-                  value_parsed="courier new,courier,monospace"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuseparator id="fontFaceMenuAfterDefaultFontsSeparator"
                        class="fontFaceMenuAfterDefaultFonts"/>
         <menuseparator id="fontFaceMenuAfterUsedFontsSeparator"
                        class="fontFaceMenuAfterUsedFonts"
                        collapsed="true"/>
           <!-- Local font face items added here by initLocalFontFaceMenu() -->
@@ -1069,24 +1066,21 @@
             crop="right">
     <observes element="font-face-select-container" attribute="disabled"/>
     <observes element="cmd_fontFace" attribute="state" onbroadcast="onFontFaceChange(this.parentNode, 'cmd_fontFace')"/>
     <menupopup id="FontFacePopup" oncommand="doStatefulCommand('cmd_fontFace', event.target.value)">
       <menuitem id="toolbarmenu_fontVarWidth" label="&fontVarWidth.label;" value=""/>
       <menuitem id="toolbarmenu_fontFixedWidth" label="&fontFixedWidth.label;" value="tt"/>
       <menuseparator id="toolbarmenuAfterGenericFontsSeparator"/>
       <menuitem id="toolbarmenu_fontHelvetica" label="&fontHelvetica.label;"
-                value="Helvetica, Arial, sans-serif"
-                value_parsed="helvetica,arial,sans-serif"/>
+                value="Helvetica, Arial, sans-serif"/>
       <menuitem id="toolbarmenu_fontTimes" label="&fontTimes.label;"
-                value="Times New Roman, Times, serif"
-                value_parsed="times new roman,times,serif"/>
+                value="Times New Roman, Times, serif"/>
       <menuitem id="toolbarmenu_fontCourier" label="&fontCourier.label;"
-                value="Courier New, Courier, monospace"
-                value_parsed="courier new,courier,monospace"/>
+                value="Courier New, Courier, monospace"/>
       <menuseparator id="toolbarmenuAfterDefaultFontsSeparator"
                      class="fontFaceMenuAfterDefaultFonts"/>
       <menuseparator id="toolbarmenuAfterUsedFontsSeparator"
                      class="fontFaceMenuAfterUsedFonts"
                      hidden="true"/>
       <!-- Local font face items added here by initLocalFontFaceMenu() -->
     </menupopup>
   </menulist>
--- a/mail/components/compose/content/editorOverlay.xul
+++ b/mail/components/compose/content/editorOverlay.xul
@@ -282,31 +282,28 @@
                   value="tt"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuseparator id="fontFaceMenuAfterGenericFontsSeparator"/>
         <menuitem id="menu_fontFaceHelvetica"
                   label="&fontHelvetica.label;"
                   accesskey="&fontHelvetica.accesskey;"
                   value="Helvetica, Arial, sans-serif"
-                  value_parsed="helvetica,arial,sans-serif"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuitem id="menu_fontFaceTimes"
                   label="&fontTimes.label;"
                   accesskey="&fontTimes.accesskey;"
                   value="Times New Roman, Times, serif"
-                  value_parsed="times new roman,times,serif"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuitem id="menu_fontFaceCourier"
                   label="&fontCourier.label;"
                   accesskey="&fontCourier.accesskey;"
                   value="Courier New, Courier, monospace"
-                  value_parsed="courier new,courier,monospace"
                   type="radio"
                   observes="cmd_renderedHTMLEnabler"/>
         <menuseparator id="fontFaceMenuAfterDefaultFontsSeparator"
                        class="fontFaceMenuAfterDefaultFonts"/>
         <menuseparator id="fontFaceMenuAfterUsedFontsSeparator"
                        class="fontFaceMenuAfterUsedFonts"
                        hidden="true"/>
           <!-- Local font face items added here by initLocalFontFaceMenu() -->
@@ -879,24 +876,21 @@
     <observes element="font-face-select-container" attribute="disabled"/>
     <observes element="cmd_fontFace" attribute="state" onbroadcast="onFontFaceChange(this.parentNode, 'cmd_fontFace')"/>
     <menupopup id="FontFacePopup"
                class="noIconPopup">
       <menuitem id="toolbarmenu_fontVarWidth" label="&fontVarWidth.label;" value=""/>
       <menuitem id="toolbarmenu_fontFixedWidth" label="&fontFixedWidth.label;" value="tt"/>
       <menuseparator id="toolbarmenuAfterGenericFontsSeparator"/>
       <menuitem id="toolbarmenu_fontHelvetica" label="&fontHelvetica.label;"
-                value="Helvetica, Arial, sans-serif"
-                value_parsed="helvetica,arial,sans-serif"/>
+                value="Helvetica, Arial, sans-serif"/>
       <menuitem id="toolbarmenu_fontTimes" label="&fontTimes.label;"
-                value="Times New Roman, Times, serif"
-                value_parsed="times new roman,times,serif"/>
+                value="Times New Roman, Times, serif"/>
       <menuitem id="toolbarmenu_fontCourier" label="&fontCourier.label;"
-                value="Courier New, Courier, monospace"
-                value_parsed="courier new,courier,monospace"/>
+                value="Courier New, Courier, monospace"/>
       <menuseparator id="toolbarmenuAfterDefaultFontsSeparator"
                      class="fontFaceMenuAfterDefaultFonts"/>
       <menuseparator id="toolbarmenuAfterUsedFontsSeparator"
                      class="fontFaceMenuAfterUsedFonts"
                      hidden="true"/>
       <!-- Local font face items added here by initLocalFontFaceMenu() -->
     </menupopup>
   </menulist>