Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 10:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed busted 'New' command in Composer, b=121939, r=brade, sr=hewitt

Browse Source
This commit is contained in:
cmanske%netscape.com 2002-01-29 00:56:08 +00:00
parent 320952d8c3
commit 50a6dacb14
3 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
editor/ui/composer/content/editor.xul
View File

@ -66,6 +66,7 @@
<script type="application/x-javascript" src="chrome://editor/content/editor.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EditorCommandsDebug.js"/>
<script type="application/x-javascript" src="chrome://editor/content/EditorContextMenu.js"/>
<script type="application/x-javascript" src="chrome://editor/content/editorApplicationOverlay.js"/>
<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaDD.js"/>
<script type="application/x-javascript" src="chrome://communicator/content/contentAreaClick.js"/>

36
editor/ui/composer/content/editorApplicationOverlay.js
View File

@ -37,28 +37,6 @@
/* Implementations of nsIControllerCommand for composer commands */
function editLink(aLinkURL)
{
urlSecurityCheck(aLinkURL, window.document); // XXX what is this? Why do we pass the chrome doc?
editPage(aLinkURL, window, false);
}
// XXX Cleanup needed here! Specifically:
// 1) rename this function to |editPage|
// 2) move |editPage| from utilityOverlay.js into this file, as well as any UI that uses it
// (which, at time of writing, is:
// * view source "edit page" menu item
// * navigator "edit page" menu item
// * "Open in Composer" item in Open Location dialog
// |editPage| should be renamed |editURL|
function overlay_editPage(aDocument)
{
if (!aDocument)
aDocument = window._content.document;
editPage(aDocument.URL, window, false);
}
function initEditorContextMenuItems(aEvent)
{
var shouldShowEditPage = !gContextMenu.onImage && !gContextMenu.onLink && !gContextMenu.onTextInput && !gContextMenu.inDirList;
@ -79,6 +57,20 @@ function initEditorContextMenuListener(aEvent)
addEventListener("load", initEditorContextMenuListener, false);
function editLink(aLinkURL)
{
urlSecurityCheck(aLinkURL, window.document); // XXX what is this? Why do we pass the chrome doc?
editPage(aLinkURL, window, false);
}
function editDocument(aDocument)
{
if (!aDocument)
aDocument = window._content.document;
editPage(aDocument.URL, window, false);
}
function editPageOrFrame()
{
var url;

2
editor/ui/composer/content/editorNavigatorOverlay.xul
View File

@ -28,7 +28,7 @@
<menuitem id="context-editpage"
label="&editPageCmd.label;"
accesskey="&editPageCmd.accesskey;"
oncommand="overlay_editPage(gContextMenu.target.ownerDocument);"
oncommand="editDocument(gContextMenu.target.ownerDocument);"
insertafter="context-sep-save"/>
<menuitem id="context-editlink"
label="&editLinkCmd.label;"