Bug 1265181 - show used fonts like "Helvetica, Arial, Sans-serif" correctly in the composer font picker. r=jorgk a=rkent
authoraceman <acelists@atlas.sk>
Sat, 16 Apr 2016 14:53:00 +0200
changeset 26925 4f1b213a9b21e2ff566e633e86624dbf235ec334
parent 26924 640bd220edb2ff51ea97c1a48c765240c07b9b4f
child 26926 63fca1af88b1ae7ada7530517c37f19283e2bbcd
push id1850
push userclokep@gmail.com
push dateWed, 08 Mar 2017 19:29:12 +0000
treeherdercomm-esr52@028df196b2d9 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, rkent
bugs1265181
Bug 1265181 - show used fonts like "Helvetica, Arial, Sans-serif" correctly in the composer font picker. r=jorgk a=rkent
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,28 +414,31 @@
                   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() -->
@@ -1066,21 +1069,24 @@
             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="Helvetica, Arial, sans-serif"
+                value_parsed="helvetica,arial,sans-serif"/>
       <menuitem id="toolbarmenu_fontTimes" label="&fontTimes.label;"
-                value="Times New Roman, Times, serif"/>
+                value="Times New Roman, Times, serif"
+                value_parsed="times new roman,times,serif"/>
       <menuitem id="toolbarmenu_fontCourier" label="&fontCourier.label;"
-                value="Courier New, Courier, monospace"/>
+                value="Courier New, Courier, monospace"
+                value_parsed="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,28 +282,31 @@
                   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() -->
@@ -876,21 +879,24 @@
     <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="Helvetica, Arial, sans-serif"
+                value_parsed="helvetica,arial,sans-serif"/>
       <menuitem id="toolbarmenu_fontTimes" label="&fontTimes.label;"
-                value="Times New Roman, Times, serif"/>
+                value="Times New Roman, Times, serif"
+                value_parsed="times new roman,times,serif"/>
       <menuitem id="toolbarmenu_fontCourier" label="&fontCourier.label;"
-                value="Courier New, Courier, monospace"/>
+                value="Courier New, Courier, monospace"
+                value_parsed="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>