Attachment #8675414 for bug #769604

Attachment #8675414: Part 3: Changed behaviour of font size increase/decrease buttons (v1b) for bug #769604

View | Details | Raw Unified | Return to bug 769604
Collapse All | Expand All






  commandTable.registerCommand("cmd_renderedHTMLEnabler", nsDummyHTMLCommand);

  commandTable.registerCommand("cmd_grid",  nsGridCommand);

  commandTable.registerCommand("cmd_listProperties",  nsListPropertiesCommand);
  commandTable.registerCommand("cmd_pageProperties",  nsPagePropertiesCommand);
  commandTable.registerCommand("cmd_colorProperties", nsColorPropertiesCommand);
  commandTable.registerCommand("cmd_increaseFontStep", nsIncreaseFontCommand);
  commandTable.registerCommand("cmd_decreaseFontStep", nsDecreaseFontCommand);
  commandTable.registerCommand("cmd_advancedProperties", nsAdvancedPropertiesCommand);
  commandTable.registerCommand("cmd_objectProperties",   nsObjectPropertiesCommand);
  commandTable.registerCommand("cmd_removeNamedAnchors", nsRemoveNamedAnchorsCommand);
  commandTable.registerCommand("cmd_editLink",        nsEditLinkCommand);

  commandTable.registerCommand("cmd_form",          nsFormCommand);
  commandTable.registerCommand("cmd_inputtag",      nsInputTagCommand);
  commandTable.registerCommand("cmd_inputimage",    nsInputImageCommand);

      case "cmd_absPos":
        pokeMultiStateUI(command, params);
        break;

      case "cmd_decreaseZIndex":
      case "cmd_increaseZIndex":
      case "cmd_indent":
      case "cmd_outdent":
      case "cmd_increaseFontStep":
      case "cmd_decreaseFontStep":
      case "cmd_removeStyles":
      case "cmd_smiley":
        break;

      default: dump("no update for command: " +command+"\n");
    }
  }
  catch (e) { dump("An error occurred updating the "+command+" command: \n"+e+"\n"); }

  doCommand: function(aCommand)
  {
    window.openDialog("chrome://editor/content/EdColorProps.xul","_blank", "chrome,close,titlebar,modal", "");
    UpdateDefaultColors();
  }
};

//-----------------------------------------------------------------------------------
// Helper function

function getFontSizeIndex()
{
  var firstHas = { value: false };
  var anyHas = { value: false };
  var allHas = { value: false };
  var sizeWasFound = false;

  var fontSize = EditorGetTextProperty("font", "size", null, firstHas, anyHas, allHas);
  var setIndex = -1;

  if (allHas.value)
  {
    switch (fontSize)
    {
    case "-3":
    case "-2":
    case "0":
    case "1":
      // x-small.
      setIndex = 0;
      break;
    case "-1":
    case "2":
      // small.
      setIndex = 1;
      break;
    case "3":
      // medium.
      setIndex = 2;
      break;
    case "+1":
    case "4":
      // large.
      setIndex = 3;
      break;
    case "+2":
    case "5":
      // x-large.
      setIndex = 4;
      break;
    case "+3":
    case "+4":
    case "6":
    case "7":
      // xx-large.
      setIndex = 5;
    }
  }

  sizeWasFound = anyHas.value || (setIndex >= 0);

  // If the element has no size attribute and no size was found at all,
  // we assume "medium" size. This is highly problematic since
  // CSS sizes are not recognised and will show as "medium" as well.
  // Currently we can't distinguish between "no attribute" which
  // can imply "medium" and "CSS attribute present" which should not
  // imply "medium".
  if (!sizeWasFound)
    setIndex = 2;

  return setIndex;
}
//-----------------------------------------------------------------------------------
var nsIncreaseFontCommand =
{
  isCommandEnabled: function(aCommand, dummy)
  {
    var enabled = (IsDocumentEditable() && IsEditingRenderedHTML());
    if (!enabled)
      return false;

    var setIndex = getFontSizeIndex();
    return (setIndex >= 0 && setIndex < 5);
  },

  getCommandStateParams: function(aCommand, aParams, aRefCon) {},
  doCommandParams: function(aCommand, aParams, aRefCon) {},

  doCommand: function(aCommand)
  {
    var setIndex = getFontSizeIndex();
    if (setIndex < 0 || setIndex >= 5)
      return;
    var sizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large' ];
    EditorSetFontSize(sizes[setIndex+1]);
  }
};

//-----------------------------------------------------------------------------------
var nsDecreaseFontCommand =
{
  isCommandEnabled: function(aCommand, dummy)
  {
    var enabled = (IsDocumentEditable() && IsEditingRenderedHTML());
    if (!enabled)
      return false;

    var setIndex = getFontSizeIndex();
    return (setIndex > 0);
  },

  getCommandStateParams: function(aCommand, aParams, aRefCon) {},
  doCommandParams: function(aCommand, aParams, aRefCon) {},

  doCommand: function(aCommand)
  {
    var setIndex = getFontSizeIndex();
    if (setIndex <= 0)
      return;
    var sizes = ['x-small', 'small', 'medium', 'large', 'x-large', 'xx-large' ];
    EditorSetFontSize(sizes[setIndex-1]);
  }
};

//-----------------------------------------------------------------------------------
var nsRemoveNamedAnchorsCommand =
{
  isCommandEnabled: function(aCommand, dummy)
  {
    // We could see if there's any link in selection, but it doesn't seem worth the work!
    return (IsDocumentEditable() && IsEditingRenderedHTML());
  },






  {
    var children = menuPopup.childNodes;
    if (!children) return;

    var firstHas = { value: false };
    var anyHas = { value: false };
    var allHas = { value: false };

    var sizeWasFound = false;
    var smallFound = false;
    var bigFound = false;

    // we need to set or clear the checkmark for each menu item since the selection
    // may be in a new location from where it was when the menu was previously opened

    // First 2 items add <small> and <big> tags
    // While it would be better to show the number of levels,


    EditorGetTextProperty("big", "", "", firstHas, anyHas, allHas);
    bigFound = anyHas.value;

    // Fixed size items start after menu separator depending on whether it is
    // a full menu.
    var menuIndex = fullMenu ? 3 : 0;

    var setIndex = getFontSizeIndex();
    // dump(fontSize + " " + anyHas.value + " " + allHas.value + "\n");
    sizeWasFound = anyHas.value;
    var setIndex = -1;

    if (allHas.value)
    {
      switch (fontSize)
      {
      case "-3":
      case "-2":
      case "0":
      case "1":
        // x-small.
        setIndex = 0;
        break;
      case "-1":
      case "2":
        // small.
        setIndex = 1;
        break;
      case "3":
        // medium.
        setIndex = 2;
        break;
      case "+1":
      case "4":
        // large.
        setIndex = 3;
        break;
      case "+2":
      case "5":
        // x-large.
        setIndex = 4;
        break;
      case "+3":
      case "+4":
      case "6":
      case "7":
        // xx-large/
        setIndex = 5;
      }
    }

    sizeWasFound |= (setIndex >= 0);

    // If the element has no size attribute and no size was found at all,
    // we assume "medium" size. This is highly problematic since
    // CSS sizes are not recognised and will show as "medium" as well.
    // Currently we can't distinguish between "no attribute" which
    // can imply "medium" and "CSS attribute present" which should not
    // imply "medium".
    if (!sizeWasFound)
      setIndex = 2;

    var lastItem = children.length - 1;
    if (setIndex >= 0)
    {
      children[menuIndex + setIndex].setAttribute("checked", true);
    }
    else
    {
      // In case of mixed, clear all items.
      for (var i = menuIndex; i < lastItem; i++)
        children[i].setAttribute("checked", false);
    }

    // Show "small"/"big" indicator.
    var htmlInfo = "";
    if (smallFound)
      htmlInfo = "<small>";
    if (bigFound)
      htmlInfo += "<big>";

    if (htmlInfo != "")
    {
      children[lastItem].setAttribute("hidden", false);
      children[lastItem].setAttribute("label", "HTML: " + htmlInfo);
      children[lastItem].setAttribute("checked", true);





         command="cmd_removeLinks"
         modifiers="accel, shift"/>
    <key id="removenamedanchorskb"
         key="&formatRemoveNamedAnchors2.key;"
         command="cmd_removeNamedAnchors"
         modifiers="accel, shift"/>
    <key id="decreasefontsizekb"
         key="&decrementFontSize.key;"
         command="cmd_decreaseFontStep"
         modifiers="accel"/>
    <key id="increasefontsizekb"
         key="&incrementFontSize.key;"
         command="cmd_increaseFontStep"
         modifiers="accel"/>
    <key key="&incrementFontSize.key;"
         command="cmd_increaseFontStep"
         modifiers="accel,shift"/>
    <key key="&incrementFontSize.key2;"
         command="cmd_increaseFontStep"
         modifiers="accel"/>

    <key id="insertlinkkb"
         key="&insertLinkCmd.key;"
         command="cmd_link"
         modifiers="accel"/>
  </keyset>


    <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_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_increaseFontStep"                oncommand="goDoCommand('cmd_increaseFontStep')"/>
    <command id="cmd_decreaseFontStep"                oncommand="goDoCommand('cmd_decreaseFontStep')"/>
    <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>

  <!-- commands updated only when the menu gets created -->
  <commandset id="composerListMenuItems"
          commandupdater="true"

    <!-- Font size submenu -->
    <menu id="fontSizeMenu" label="&fontSizeMenu.label;"
          accesskey="&fontSizeMenu.accesskey;"
          position="2">
      <menupopup id="fontSizeMenuPopup" onpopupshowing="initFontSizeMenu(this, true)">
      <menuitem id="menu_decreaseFontSize"
                label="&decreaseFontSize.label;"
                accesskey="&decreaseFontSize.accesskey;"
                command="cmd_decreaseFontStep"
                type="radio"
                name="1"
                key="decreasefontsizekb"/>
      <menuitem id="menu_increaseFontSize"
                label="&increaseFontSize.label;"
                accesskey="&increaseFontSize.accesskey;"
                command="cmd_increaseFontStep"
                type="radio"
                name="1" key="increasefontsizekb"/>
        <menuseparator id="fontSizeMenuAfterIncreaseFontSizeSeparator"/>
        <menuitem id="menu_x-small"
                  label="&size-tinyCmd.label;"
                  accesskey="&size-tinyCmd.accesskey;"
                  oncommand="EditorSetFontSize('x-small')"
                  type="radio"

                oncommand="EditorSetFontSize('xx-large')"/>
      <menuitem id="toobarmenu_fontSize_smallBigInfo"
                type="radio" name="2" disabled="true" hidden="true"/>
    </menupopup>
  </toolbarbutton>
  <toolbarbutton id="DecreaseFontSizeButton"
                 class="formatting-button"
                 tooltiptext="&decreaseFontSizeToolbarCmd.tooltip;"
                 command="cmd_decreaseFontStep"/>
  <toolbarbutton id="IncreaseFontSizeButton"
                 class="formatting-button"
                 tooltiptext="&increaseFontSizeToolbarCmd.tooltip;"
                 command="cmd_increaseFontStep"/>
  <toolbarbutton id="boldButton"
                 class="formatting-button"
                 tooltiptext="&boldToolbarCmd.tooltip;"
                 type="checkbox"
                 autoCheck="false"
                 command="cmd_bold">
    <observes element="cmd_bold" type="checkbox" attribute="state" onbroadcast="onButtonUpdate(this.parentNode, 'cmd_bold')"/>
  </toolbarbutton>





    goUpdateCommand("cmd_rewrap");

    // Insert Menu
    if (gMsgCompose && gMsgCompose.composeHTML)
    {
      goUpdateCommand("cmd_renderedHTMLEnabler");
      goUpdateCommand("cmd_fontColor");
      goUpdateCommand("cmd_backgroundColor");
      goUpdateCommand("cmd_decreaseFontStep");
      goUpdateCommand("cmd_increaseFontStep");
      goUpdateCommand("cmd_bold");
      goUpdateCommand("cmd_italic");
      goUpdateCommand("cmd_underline");
      goUpdateCommand("cmd_ul");
      goUpdateCommand("cmd_ol");
      goUpdateCommand("cmd_indent");
      goUpdateCommand("cmd_outdent");
      goUpdateCommand("cmd_align");






    <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="&decrementFontSize.key;"    observes="cmd_decreaseFontStep"  modifiers="accel"/>
    <key                           key="&decrementFontSize.key;"    observes="cmd_decreaseFontStep"  modifiers="accel, shift"/>
    <key                           key="&decrementFontSize.key2;"   observes="cmd_decreaseFontStep"  modifiers="accel"/>

    <key id="increasefontsizekb"   key="&incrementFontSize.key;"    observes="cmd_increaseFontStep"  modifiers="accel"/>
    <key                           key="&incrementFontSize.key;"    observes="cmd_increaseFontStep"  modifiers="accel, shift"/>
    <key                           key="&incrementFontSize.key2;"   observes="cmd_increaseFontStep"  modifiers="accel"/>

    <key id="insertlinkkb"         key="&insertLinkCmd.key;"           observes="cmd_link"          modifiers="accel"/>
  </keyset>

  <!-- commands updated when the editor gets created -->
  <commandset id="commonEditorMenuItems"
          commandupdater="true"
          events="create"

    <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_increaseFontStep"                oncommand="goDoCommand('cmd_increaseFontStep')"/>
    <command id="cmd_decreaseFontStep"                oncommand="goDoCommand('cmd_decreaseFontStep')"/>

    <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>

  <!-- commands updated only when the menu gets created -->
  <commandset id="composerListMenuItems"

    <menu id="fontSizeMenu" label="&fontSizeMenu.label;"
          accesskey="&fontSizeMenu.accesskey;"
          position="2">
      <menupopup id="fontSizeMenuPopup" onpopupshowing="initFontSizeMenu(this, true)">
        <menuitem id="menu_decreaseFontSize"
                  label="&decreaseFontSize.label;"
                  accesskey="&decreaseFontSize.accesskey;"
                  key="decreasefontsizekb"
                  observes="cmd_decreaseFontStep"
                  type="radio"
                  name="1"/>
        <menuitem id="menu_increaseFontSize"
                  label="&increaseFontSize.label;"
                  accesskey="&increaseFontSize.accesskey;"
                  key="increasefontsizekb"
                  observes="cmd_increaseFontStep"
                  type="radio"
                  name="1"/>
        <menuseparator id="fontSizeMenuAfterIncreaseFontSizeSeparator"/>
        <menuitem id="menu_size-x-small"
                  label="&size-tinyCmd.label;"
                  accesskey="&size-tinyCmd.accesskey;"
                  oncommand="EditorSetFontSize('x-small')"
                  type="radio"

                oncommand="EditorSetFontSize('xx-large')"/>
      <menuitem id="toobarmenu_fontSize_smallBigInfo"
                type="radio" name="2" disabled="true" hidden="true"/>
    </menupopup>
  </toolbarbutton>
  <toolbarbutton id="DecreaseFontSizeButton"
                 class="formatting-button"
                 tooltiptext="&decreaseFontSizeToolbarCmd.tooltip;"
                 observes="cmd_decreaseFontStep"/>
  <toolbarbutton id="IncreaseFontSizeButton"
                 class="formatting-button"
                 tooltiptext="&increaseFontSizeToolbarCmd.tooltip;"
                 observes="cmd_increaseFontStep"/>
  <toolbarbutton id="boldButton"
                 class="formatting-button"
                 tooltiptext="&boldToolbarCmd.tooltip;"
                 type="checkbox"
                 autoCheck="false"
                 observes="cmd_bold">
    <observes element="cmd_bold" type="checkbox" attribute="state" onbroadcast="onButtonUpdate(this.parentNode, 'cmd_bold')"/>
  </toolbarbutton>





  try {
    // Edit Menu
    goUpdateCommand("cmd_rewrap");

    // Insert Menu
    if (gMsgCompose && gMsgCompose.composeHTML)
    {
      goUpdateCommand("cmd_renderedHTMLEnabler");
      goUpdateCommand("cmd_decreaseFontStep");
      goUpdateCommand("cmd_increaseFontStep");
      goUpdateCommand("cmd_bold");
      goUpdateCommand("cmd_italic");
      goUpdateCommand("cmd_underline");
      goUpdateCommand("cmd_ul");
      goUpdateCommand("cmd_ol");
      goUpdateCommand("cmd_indent");
      goUpdateCommand("cmd_outdent");
      goUpdateCommand("cmd_align");

Return to bug 769604