From 7db449cd06ce90f65dcb5854547db28ea52e41e1 Mon Sep 17 00:00:00 2001 From: "law%netscape.com" Date: Sat, 9 Oct 1999 06:16:33 +0000 Subject: [PATCH] Bug #14999; removed use of toolkit app core; rev=sfraser@netscape.com git-svn-id: svn://10.0.0.236/trunk@50311 18797224-902f-48f8-a5cc-f745e15eee43 --- .../ui/composer/content/EditorCommands.js | 48 +++---------------- 1 file changed, 7 insertions(+), 41 deletions(-) diff --git a/mozilla/editor/ui/composer/content/EditorCommands.js b/mozilla/editor/ui/composer/content/EditorCommands.js index f50e985ae6a..4cec7a377fe 100644 --- a/mozilla/editor/ui/composer/content/EditorCommands.js +++ b/mozilla/editor/ui/composer/content/EditorCommands.js @@ -236,39 +236,19 @@ function EditorOpen() function EditorNewPlaintext() { dump("In EditorNewPlaintext..\n"); - - core = XPAppCoresManager.Find("toolkitCore"); - if ( !core ) { - core = new ToolkitCore(); - if ( core ) { - core.Init("toolkitCore"); - } - } - if ( core ) { - core.ShowWindowWithArgs( "chrome://editor/content/TextEditorAppShell.xul", window, "chrome://editor/content/EditorInitPagePlain.html" ); - } else { - dump("Error; can't create toolkitCore\n"); - } + window.openDialog( "chrome://editor/content/TextEditorAppShell.xul", + "_blank", + "chrome,dialog=no,all", + "chrome://editor/content/EditorInitPagePlain.html" ); } function EditorNewBrowser() { dump("In EditorNewBrowser..\n"); - - core = XPAppCoresManager.Find("toolkitCore"); - if ( !core ) { - core = new ToolkitCore(); - if ( core ) { - core.Init("toolkitCore"); - } - } - if ( core ) { - core.ShowWindowWithArgs( "chrome://navigator/content/navigator.xul", window, "" ); - } else { - dump("Error; can't create toolkitCore\n"); - } + window.open( "chrome://navigator/content/", "_blank", "chrome" ); } + function EditorSave() { dump("In EditorSave...\n"); @@ -1185,21 +1165,7 @@ function EditorTestDocument() // --------------------------- Callbacks --------------------------- function OpenFile(url) { - // This is invoked from the browser app core. - // TODO: REMOVE THIS WHEN WE STOP USING TOOLKIT CORE - core = XPAppCoresManager.Find("toolkitCore"); - if ( !core ) { - core = new ToolkitCore(); - if ( core ) { - core.Init("toolkitCore"); - } - } - if ( core ) { - // TODO: Convert this to use window.open() instead - core.ShowWindowWithArgs( "chrome://editor/content/", window, url ); - } else { - dump("Error; can't create toolkitCore\n"); - } + alert( "EditorCommands.js OpenFile should not be called!" ); } // --------------------------- Status calls ---------------------------