Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed conflicting insert HTML commands. b=180303, r=akkana, sr=kin

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@134637 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cmanske%netscape.com
2002-12-02 23:00:54 +00:00
parent d67bf81692
commit 53a7359942
2 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
mozilla/editor/ui/composer/content/ComposerCommands.js
View File

@@ -81,7 +81,7 @@ function SetupHTMLEditorCommands()
commandManager.registerCommand("cmd_hline", nsHLineCommand);
commandManager.registerCommand("cmd_link", nsLinkCommand);
commandManager.registerCommand("cmd_anchor", nsAnchorCommand);
commandManager.registerCommand("cmd_insertHTML", nsInsertHTMLCommand);
commandManager.registerCommand("cmd_insertHTMLWithDialog", nsInsertHTMLWithDialogCommand);
commandManager.registerCommand("cmd_insertBreak", nsInsertBreakCommand);
commandManager.registerCommand("cmd_insertBreakAll",nsInsertBreakAllCommand);
@@ -1158,7 +1158,7 @@ var gEditorOutputProgressListener =
// Notify progress dialog that we're finished
// and keep open to show error
gProgressDialog.SetProgressFinished(null,0);
gProgressDialog.SetProgressFinished(null, 0);
// We don't want to change location or reset mod count, etc.
return;
@@ -1245,7 +1245,7 @@ var gEditorOutputProgressListener =
// We previously aborted publishing because of error:
// Calling gPersistObj.cancelSave() resulted in a non-zero gPersistObj.result,
// so notify progress dialog we're finished
gProgressDialog.SetProgressFinished(null,0);
gProgressDialog.SetProgressFinished(null, 0);
}
}
}
@@ -1396,7 +1396,7 @@ var gEditorOutputProgressListener =
dlgTitle, text, pwObj, checkBoxLabel, savePWObj);
if (!ret)
setTimeout(CancelPublishing,0);
setTimeout(CancelPublishing(), 0);
if (ret && gPublishData)
UpdateUsernamePasswordFromPrompt(gPublishData, gPublishData.username, pwObj.value, savePWObj.value);
@@ -1408,7 +1408,7 @@ var gEditorOutputProgressListener =
{
var ret = PromptUsernameAndPassword(dlgTitle, text, savePWObj.value, userObj, pwObj);
if (!ret)
setTimeout(CancelPublishing,0);
setTimeout(CancelPublishing(), 0);
return ret;
},
@@ -1432,7 +1432,7 @@ var gEditorOutputProgressListener =
var ret = promptServ.prompt(gProgressDialog ? gProgressDialog : window,
dlgTitle, text, defaultText, pwrealm, savePWObj);
if (!ret)
setTimeout(CancelPublishing,0);
setTimeout(CancelPublishing(), 0);
return ret;
},
@@ -1440,7 +1440,7 @@ var gEditorOutputProgressListener =
{
var ret = PromptUsernameAndPassword(dlgTitle, text, savePW, userObj, pwObj);
if (!ret)
setTimeout(CancelPublishing,0);
setTimeout(CancelPublishing(), 0);
return ret;
},
@@ -1465,7 +1465,7 @@ var gEditorOutputProgressListener =
dlgTitle, text, pwObj, GetString("SavePassword"), savePWObj);
if (!ret)
setTimeout(CancelPublishing,0);
setTimeout(CancelPublishing(), 0);
if (ret && gPublishData)
UpdateUsernamePasswordFromPrompt(gPublishData, gPublishData.username, pwObj.value, savePWObj.value);
@@ -2775,7 +2775,7 @@ var nsAnchorCommand =
};
//-----------------------------------------------------------------------------------
var nsInsertHTMLCommand =
var nsInsertHTMLWithDialogCommand =
{
isCommandEnabled: function(aCommand, dummy)
{

14
mozilla/editor/ui/composer/content/editorOverlay.xul
View File

@@ -120,7 +120,7 @@
<command id="cmd_isindex" oncommand="goDoCommand('cmd_isindex')"/>
<command id="cmd_objectProperties" oncommand="goDoCommand('cmd_objectProperties')"/>
<command id="cmd_insertChars" oncommand="goDoCommand('cmd_insertChars')" label="&insertCharsCmd.label;"/>
<command id="cmd_insertHTML" oncommand="goDoCommand('cmd_insertHTML')" label="&insertHTMLCmd.label;"/>
<command id="cmd_insertHTMLWithDialog" oncommand="goDoCommand('cmd_insertHTMLDlg')" label="&insertHTMLCmd.label;"/>
<command id="cmd_insertBreak" oncommand="goDoCommand('cmd_insertBreak')"/>
<command id="cmd_insertBreakAll" oncommand="goDoCommand('cmd_insertBreakAll')"/>
@@ -190,7 +190,7 @@
<command id="cmd_italic" state="false" oncommand="doStyleUICommand('cmd_italic')"/>
<command id="cmd_underline" state="false" oncommand="doStyleUICommand('cmd_underline')"/>
<command id="cmd_tt" state="false" oncommand="doStyleUICommand('cmd_tt')"/>
<command id="cmd_smiley" state="" />
<command id="cmd_smiley"/>
<command id="cmd_strikethrough" state="false" oncommand="doStyleUICommand('cmd_strikethrough');"/>
<command id="cmd_superscript" state="false" oncommand="doStyleUICommand('cmd_superscript');"/>
@@ -221,7 +221,7 @@
<command id="cmd_backgroundColor" state=""/>
<command id="cmd_highlight" state="transparent" oncommand="EditorSelectColor('Highlight', event);"/>
<command id="cmd_fontSize" state="" oncommand="goDoCommand('cmd_fontSize')"/>
<command id="cmd_fontSize" oncommand="goDoCommand('cmd_fontSize')"/>
<command id="cmd_align" state=""/>
<command id="cmd_advancedProperties" oncommand="goDoCommand('cmd_advancedProperties')"/>
@@ -312,7 +312,8 @@
</menu>
<menuitem accesskey="&fileopenremote.accesskey;" key="openremoteeditorkb" observes="cmd_openRemote"/>
<menuitem accesskey="&fileopen.accesskey;" key="openeditorkb" observes="cmd_open" label="&openFileCmd.label;"/>
<menu id="menu_RecentFiles" accesskey="&filerecentmenu.accesskey;" label="&fileRecentMenu.label;" onpopupshowing="BuildRecentMenu()">
<menu id="menu_RecentFiles" accesskey="&filerecentmenu.accesskey;" label="&fileRecentMenu.label;"
onpopupshowing="BuildRecentMenu()">
<menupopup id="menupopup_RecentFiles" oncommand="editPage(event.target.getAttribute('value'), window, false);"/>
<!-- menuitems appended at runtime -->
</menu>
@@ -402,7 +403,7 @@
<menuitem accesskey="&insertlink.accesskey;" observes="cmd_link" label="&insertLinkCmd.label;" key="insertlinkkb"/>
<menuitem accesskey="&insertanchor.accesskey;" observes="cmd_anchor" label="&insertAnchorCmd.label;"/>
<menuitem accesskey="&inserthline.accesskey;" observes="cmd_hline" label="&insertHLineCmd.label;"/>
<menuitem accesskey="&HTMLSourceMode.accesskey;" observes="cmd_insertHTML" key="inserthtmlkb"/>
<menuitem accesskey="&HTMLSourceMode.accesskey;" observes="cmd_insertHTMLWithDialog" key="inserthtmlkb"/>
<menuitem accesskey="&insertchars.accesskey;" observes="cmd_insertChars" id="insertChars"/>
<menu label="&tocMenu.label;" accesskey="&tocMenu.accesskey;">
<menupopup onpopupshowing="InitTOCMenu()">
@@ -738,7 +739,8 @@
tooltiptext="&anchorToolbarCmd.tooltip;"/>
<!-- Formatting toolbar items. "value" are HTML tagnames, don't translate -->
<menulist class="toolbar-focustarget" id="ParagraphSelect" tooltiptext="&ParagraphSelect.tooltip;" crop="right">
<menulist class="toolbar-focustarget" id="ParagraphSelect"
tooltiptext="&ParagraphSelect.tooltip;" crop="right">
<observes element="cmd_paragraphState" attribute="state" onbroadcast="onParagraphFormatChange(this.parentNode, 'cmd_paragraphState')"/>
<menupopup id="ParagraphPopup" oncommand="doStatefulCommand('cmd_paragraphState', event.target.value)">
<menuitem label="&bodyTextCmd.label;" value=""/>