Attachment 639170 Details for Bug 769604

[patch] Patch v1

769604-v1.diff (text/plain), 11.62 KB, created by Mike Conley (:mconley) (:⚙️)

(hide)

Description:

Filename:

MIME Type:

Creator: Mike Conley (:mconley) (:⚙️)

Size: 11.62 KB

patch

obsolete

>diff --git a/editor/ui/composer/content/editor.js b/editor/ui/composer/content/editor.js
>--- a/editor/ui/composer/content/editor.js
>+++ b/editor/ui/composer/content/editor.js
>@@ -811,31 +811,61 @@ function EditorSelectFontSize()
>   {
>     if (select.selectedIndex == -1)
>       return;
> 
>     EditorSetFontSize(gFontSizeNames[select.selectedIndex]);
>   }
> }
> 
>+function ConvertFontClassToSize(aSize)
>+{
>+  switch (aSize)
>+  {
>+    case "xx-small":
>+      return "-3";
>+    case "x-small":
>+      return "-2";
>+    case "small":
>+      return "-1";
>+    case "normal":
>+    case "medium":
>+      return "0";
>+    case "large":
>+      return "+1";
>+    case "x-large":
>+      return "+2";
>+    case "xx-large":
>+      return "+3";
>+  }
>+
>+  // If all else fails, return "0".
>+  return "0";
>+}
>+
> function onFontSizeChange(fontSizeMenulist, commandID)
> {
>+  let commandNode = document.getElementById(commandID);
>+  let state = commandNode.getAttribute("state");
>+  if (!state)
>+    state = "0";
>+
>   // If we don't match anything, set to "0 (normal)"
>   var newIndex = 2;
>-  var size = fontSizeMenulist.getAttribute("size");
>-  if ( size == "mixed")
>+
>+  if ( state == "mixed")
>   {
>     // No single type selected
>     newIndex = -1;
>   }
>   else
>   {
>     for (var i = 0; i < gFontSizeNames.length; i++)
>     {
>-      if( gFontSizeNames[i] == size )
>+      if( ConvertFontClassToSize(gFontSizeNames[i]) == state )
>       {
>         newIndex = i;
>         break;
>       }
>     }
>   }
>   if (fontSizeMenulist.selectedIndex != newIndex)
>     fontSizeMenulist.selectedIndex = newIndex;
>@@ -998,35 +1028,37 @@ function initFontSizeMenu(menuPopup)
>     menuItem = children[1];
>     if (menuItem)
>     {
>       EditorGetTextProperty("big", "", "", firstHas, anyHas, allHas);
>       menuItem.setAttribute("checked", allHas.value);
>       sizeWasFound |= anyHas.value;
>     }
> 
>-    // Fixed size items start after menu separator
>-    var menuIndex = 3;
>+    var menuIndex = 0;
>     // Index of the medium (default) item
>-    var mediumIndex = 5;
>+    var mediumIndex = 2;
> 
>     // Scan through all supported "font size" attribute values
>     for (var i = -2; i <= 3; i++)
>     {
>       menuItem = children[menuIndex];
> 
>       // Skip over medium since it'll be set below.
>       // If font size=0 is actually set, we'll toggle it off below if
>       // we enter this loop in this case.
>       if (menuItem && (i != 0))
>       {
>         var sizeString = (i <= 0) ? String(i) : ("+" + String(i));
>         EditorGetTextProperty("font", "size", sizeString, firstHas, anyHas, allHas);
>         // Check the item only if all of selection has the size...
>         menuItem.setAttribute("checked", allHas.value);
>+        if (allHas.value) {
>+          dump("\n\nWOOP!" + menuIndex + "\n\n");
>+        }
>         // ...but remember if ANY of of selection had size set
>         sizeWasFound |= anyHas.value;
>       }
>       menuIndex++;
>     }
> 
>     // if no size was found, then check default (medium)
>     // note that no item is checked in the case of "mixed" selection
>diff --git a/mail/components/compose/content/MsgComposeCommands.js b/mail/components/compose/content/MsgComposeCommands.js
>--- a/mail/components/compose/content/MsgComposeCommands.js
>+++ b/mail/components/compose/content/MsgComposeCommands.js
>@@ -813,18 +813,16 @@ function updateComposeItems()
>   try {
>     // Edit Menu
>     goUpdateCommand("cmd_rewrap");
> 
>     // Insert Menu
>     if (gMsgCompose && gMsgCompose.composeHTML)
>     {
>       goUpdateCommand("cmd_renderedHTMLEnabler");
>-      goUpdateCommand("cmd_decreaseFont");
>-      goUpdateCommand("cmd_increaseFont");
>       goUpdateCommand("cmd_bold");
>       goUpdateCommand("cmd_italic");
>       goUpdateCommand("cmd_underline");
>       goUpdateCommand("cmd_ul");
>       goUpdateCommand("cmd_ol");
>       goUpdateCommand("cmd_indent");
>       goUpdateCommand("cmd_outdent");
>       goUpdateCommand("cmd_align");
>diff --git a/mail/components/compose/content/editorOverlay.xul b/mail/components/compose/content/editorOverlay.xul
>--- a/mail/components/compose/content/editorOverlay.xul
>+++ b/mail/components/compose/content/editorOverlay.xul
>@@ -26,20 +26,16 @@
> 
>     <key id="increaseindentkb"  key="&increaseIndent.key;"  observes="cmd_indent"  modifiers="accel"/>
>     <key id="decreaseindentkb"  key="&decreaseIndent.key;"  observes="cmd_outdent"  modifiers="accel"/>
> 
>     <key id="removestyleskb"       key="&formatRemoveStyles.key;"   observes="cmd_removeStyles"  modifiers="accel, shift"/>
>     <key id="removestyleskb2"       key=" "   observes="cmd_removeStyles"  modifiers="accel"/>
>     <key id="removelinkskb"        key="&formatRemoveLinks.key;"    observes="cmd_removeLinks"  modifiers="accel, shift"/>
>     <key id="removenamedanchorskb" key="&formatRemoveNamedAnchors2.key;"    observes="cmd_removeNamedAnchors"  modifiers="accel, shift"/>
>-    <key id="decreasefontsizekb"   key="&decreaseFontSize.key;"     observes="cmd_decreaseFont"  modifiers="accel"/>
>-    <key id="increasefontsizekb"   key="&increaseFontSize.key;"     observes="cmd_increaseFont"  modifiers="accel"/>
>-    <key                           key="&increaseFontSize.key;"     observes="cmd_increaseFont"  modifiers="accel,shift"/>
>-    <key                           key="&increaseFontSize.key2;"    observes="cmd_increaseFont"  modifiers="accel"/>
> 
>     <key id="insertlinkkb"         key="&insertLinkCmd.key;"           observes="cmd_link"          modifiers="accel"/>
>   </keyset>
> 
>   
>   <commandset id="commonEditorMenuItems"
>           commandupdater="true"
>           events="create"
>@@ -138,28 +134,25 @@
>     <command id="cmd_paragraphState"  state=""         oncommand="doStatefulCommand('cmd_paragraphState', event.target.value)"/>
>     <command id="cmd_fontFace"        state=""         oncommand="doStatefulCommand('cmd_fontFace', event.target.value)"/>
> 
>     
>     <command id="cmd_fontColor"       state=""/>
>     <command id="cmd_backgroundColor" state=""/>
>     <command id="cmd_highlight"       state="transparent"  oncommand="EditorSelectColor('Highlight', event);"/>
> 
>-    <command id="cmd_fontSize"                         oncommand="goDoCommand('cmd_fontSize')"/>
>+    <command id="cmd_fontSize"        state=""         oncommand="doStatefulCommand('cmd_fontSize', event.target.value)"/>
>     <command id="cmd_align"           state=""/>
> 
>     <command id="cmd_absPos"          state=""        oncommand="goDoCommand('cmd_absPos')"/>
>     <command id="cmd_increaseZIndex"  state=""        oncommand="goDoCommand('cmd_increaseZIndex')"/>
>     <command id="cmd_decreaseZIndex"  state=""        oncommand="goDoCommand('cmd_decreaseZIndex')"/>
> 
>     <command id="cmd_advancedProperties"              oncommand="goDoCommand('cmd_advancedProperties')"/>
> 
>-    <command id="cmd_increaseFont"                    oncommand="goDoCommand('cmd_increaseFont')"/>
>-    <command id="cmd_decreaseFont"                    oncommand="goDoCommand('cmd_decreaseFont')"/>
>-    
>     <command id="cmd_removeStyles"                    oncommand="goDoCommand('cmd_removeStyles')"/>
>     <command id="cmd_removeLinks"                     oncommand="goDoCommand('cmd_removeLinks')"/>
>     <command id="cmd_removeNamedAnchors"              oncommand="goDoCommand('cmd_removeNamedAnchors')"/>
>   </commandset>
> 
>   
>   <commandset id="composerListMenuItems"
>           commandupdater="true"
>@@ -305,31 +298,16 @@
>       </menupopup>
>     </menu>
> 
>     
>     <menu id="fontSizeMenu" label="&fontSizeMenu.label;"
>           accesskey="&fontSizeMenu.accesskey;"
>           position="2">
>       <menupopup id="fontSizeMenuPopup" onpopupshowing="initFontSizeMenu(this)">
>-        <menuitem id="menu_decreaseFontSize"
>-                  label="&decreaseFontSize.label;"
>-                  accesskey="&decreaseFontSize.accesskey;"
>-                  key="decreasefontsizekb"
>-                  observes="cmd_decreaseFont"
>-                  type="radio"
>-                  name="1"/>
>-        <menuitem id="menu_increaseFontSize"
>-                  label="&increaseFontSize.label;"
>-                  accesskey="&increaseFontSize.accesskey;"
>-                  key="increasefontsizekb"
>-                  observes="cmd_increaseFont"
>-                  type="radio"
>-                  name="1"/>
>-        <menuseparator id="fontSizeMenuAfterIncreaseFontSizeSeparator"/>
> 
>         <menuitem id="menu_size-x-small"
>@@ -893,28 +871,29 @@
>                 value="Courier New, Courier, monospace"/>
>       <menuseparator id="toolbarmenuAfterFontFaceCourierSeparator"/>
>     </menupopup>
>   </menulist>
> </toolbaritem>
> 
> <toolbaritem id="font-size-select-container"
>              class="formatting-button"
>-             tooltiptext="&FontSizeSelect.tooltip;">
>+             tooltiptext="&FontSizeSelect.tooltip;"
>+             observes="cmd_renderedHTMLEnabler">
>   <menulist id="FontSizeSelect"
>             class="toolbar-focustarget"
>             crop="right"
>             oncommand="EditorSelectFontSize();">
>     <observes element="font-size-select-container" attribute="disabled"/>
>     <observes element="cmd_fontSize" attribute="state" onbroadcast="onFontSizeChange(this.parentNode, 'cmd_fontSize')"/>
>     <menupopup id="FontSizePopup">
>       <menuitem id="toobarmenu_fontSize_xx-small" label="&size-xx-smallCmd.label;"/>
>       <menuitem id="toobarmenu_fontSize_x-small" label="&size-x-smallCmd.label;"/>
>       <menuitem id="toobarmenu_fontSize_small" label="&size-smallCmd.label;"/>
>-      <menuitem id="toobarmenu_fontSize_medium" label="&size-mediumCmd.label;"/>
>+      <menuitem id="toobarmenu_fontSize_medium" label="&size-mediumCmd.label;" selected="true"/>
>       <menuitem id="toobarmenu_fontSize_large" label="&size-largeCmd.label;"/>
>       <menuitem id="toobarmenu_fontSize_x-large" label="&size-x-largeCmd.label;"/>
>       <menuitem id="toobarmenu_fontSize_xx-large" label="&size-xx-largeCmd.label;"/>
>     </menupopup>
>   </menulist>
> </toolbaritem>
> 
> <toolbaritem id="color-buttons-container"
>diff --git a/mail/components/compose/content/messengercompose.xul b/mail/components/compose/content/messengercompose.xul
>--- a/mail/components/compose/content/messengercompose.xul
>+++ b/mail/components/compose/content/messengercompose.xul
>@@ -816,20 +816,19 @@
>   
>   <vbox id="appcontent" flex="1">
>     
>     <toolbox id="FormatToolbox" mode="icons">
>       <toolbar class="chromeclass-toolbar" id="FormatToolbar" persist="collapsed"
>                customizable="true" nowindowdrag="true">
>         <toolbaritem id="paragraph-select-container"/>
>         <toolbaritem id="font-face-select-container"/>
>+        <toolbaritem id="font-size-select-container"/>
>         <toolbaritem id="color-buttons-container"
>                      disableoncustomize="true"/>
>-        <toolbarbutton id="DecreaseFontSizeButton"/>
>-        <toolbarbutton id="IncreaseFontSizeButton"/>
>         <toolbarseparator class="toolbarseparator-standard"/>
>         <toolbarbutton id="boldButton"/>
>         <toolbarbutton id="italicButton"/>
>         <toolbarbutton id="underlineButton"/>
>         <toolbarseparator class="toolbarseparator-standard"/>
>         <toolbarbutton id="ulButton"/>
>         <toolbarbutton id="olButton"/>
>         <toolbarbutton id="outdentButton"/>

Actions: View | Diff | Review

Attachments on bug 769604: 639170 | 639174 | 8670961 | 8670964 | 8671299 | 8672215 | 8672237 | 8672249 | 8672250 | 8672257 | 8672258 | 8672262 | 8672263 | 8672278 | 8672279 | 8672294 | 8672295 | 8672300 | 8672321 | 8672326 | 8672352 | 8672410 | 8672411 | 8672414 | 8674409 | 8674559 | 8674731 | 8674996 | 8675030 | 8675392 | 8675414 | 8675442 | 8676916 | 8676922 | 8678548 | 8680244 | 8680608 | 8687376 | 8696359 | 8696360