Updates to the xul file to leverage the fact that we are now correctly adding ourselves to the app cores manager when we create a compose app core. We should never try to re-add the app core by directy calling Add in JS.
git-svn-id: svn://10.0.0.236/trunk@25541 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
parent
00dad5e4e7
commit
e4c75dfd8d
@ -55,25 +55,26 @@
|
||||
dump("Creating EditorAppCore...\n");
|
||||
editorAppCore = new EditorAppCore();
|
||||
editorAppCore.Init("EditorAppCore");
|
||||
dump("Adding EditorAppCore to AppCoreManager...\n");
|
||||
XPAppCoresManager.Add(editorAppCore);
|
||||
dump("editor app core correctly added to app cores manager");
|
||||
}
|
||||
if (editorAppCore != null) {
|
||||
dump("initalizing the editor app core");
|
||||
editorAppCore.setContentWindow(window.frames[0]);
|
||||
editorAppCore.setWebShellWindow(window);
|
||||
editorAppCore.setToolbarWindow(window);
|
||||
}
|
||||
|
||||
composeAppCore = XPAppCoresManager.Find("ComposeAppCore");
|
||||
if (composeAppCore==null) {
|
||||
if (composeAppCore == null) {
|
||||
dump("creating new compose app core with new editor");
|
||||
composeAppCore = new ComposeAppCore();
|
||||
if (composeAppCore != null) {
|
||||
dump("ComposeAppCore was created!\n");
|
||||
composeAppCore.Init("ComposeAppCore");
|
||||
XPAppCoresManager.Add(composeAppCore);
|
||||
}
|
||||
}
|
||||
if(composeAppCore != null) {
|
||||
dump("setting window & editor for compose app core");
|
||||
composeAppCore.SetWindow(window);
|
||||
composeAppCore.SetEditor(editorAppCore);
|
||||
composeAppCore.CompleteCallback("MessageSent();");
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user