|
|
@ -150,7 +150,10 @@ define("webodf/editor/Editor", [
|
|
|
|
odfCanvas.addListener("statereadychange", function () {
|
|
|
|
odfCanvas.addListener("statereadychange", function () {
|
|
|
|
if (!editorReadyCallback) {
|
|
|
|
if (!editorReadyCallback) {
|
|
|
|
// already called once, restart session and return
|
|
|
|
// already called once, restart session and return
|
|
|
|
editorSession.sessionController.setUndoManager(new gui.TrivialUndoManager());
|
|
|
|
// undo manager is not yet integrated with collaboration
|
|
|
|
|
|
|
|
if (! server) {
|
|
|
|
|
|
|
|
editorSession.sessionController.setUndoManager(new gui.TrivialUndoManager());
|
|
|
|
|
|
|
|
}
|
|
|
|
editorSession.startEditing();
|
|
|
|
editorSession.startEditing();
|
|
|
|
return;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -161,7 +164,10 @@ define("webodf/editor/Editor", [
|
|
|
|
editorSession = new EditorSession(session, memberid, {
|
|
|
|
editorSession = new EditorSession(session, memberid, {
|
|
|
|
viewOptions: viewOptions
|
|
|
|
viewOptions: viewOptions
|
|
|
|
});
|
|
|
|
});
|
|
|
|
editorSession.sessionController.setUndoManager(new gui.TrivialUndoManager());
|
|
|
|
// undo manager is not yet integrated with collaboration
|
|
|
|
|
|
|
|
if (! server) {
|
|
|
|
|
|
|
|
editorSession.sessionController.setUndoManager(new gui.TrivialUndoManager());
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
if (memberListDiv) {
|
|
|
|
if (memberListDiv) {
|
|
|
|
memberList = new MemberList(editorSession, memberListDiv);
|
|
|
|
memberList = new MemberList(editorSession, memberListDiv);
|
|
|
|