update from webodf

js/editor/Editor.js

@@ -150,7 +150,10 @@ define("webodf/editor/Editor", [
                 odfCanvas.addListener("statereadychange", function () {
                     if (!editorReadyCallback) {
                         // 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();
                         return;
                     }
@@ -161,7 +164,10 @@ define("webodf/editor/Editor", [
                     editorSession = new EditorSession(session, memberid, {
                         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) {
                         memberList = new MemberList(editorSession, memberListDiv);

js/editor/SessionListView.js

@@ -32,10 +32,13 @@
  * @source: http://www.webodf.org/
  * @source: http://gitorious.org/webodf/webodf/
  */
+
 /*global Node, define, runtime */
 
-function SessionListView(sessionList, sessionListDiv, cb) {
+define("webodf/editor/SessionListView", [], function () {
-        "use strict";
+    "use strict";
+
+    return function SessionListView(sessionList, sessionListDiv, cb) {
         var self = this,
             memberDataChangedHandler;
 
@@ -108,4 +111,5 @@ function SessionListView(sessionList, sessionListDiv, cb) {
         }
 
         init();
-}
+    };
+});

js/editor/boot_editor.js

@@ -305,15 +305,19 @@ var webodfEditor = (function () {
         }
 
         function showSessions() {
-            var sessionListDiv = document.getElementById("sessionList"),
+            require({ }, ["webodf/editor/SessionListView"],
-                sessionList = new serverFactory.createSessionList(server),
+                function (SessionListView) {
-                sessionListView = new SessionListView(sessionList, sessionListDiv, enterSession);
+                    var sessionListDiv = document.getElementById("sessionList"),
+                        sessionList = new serverFactory.createSessionList(server),
+                        sessionListView = new SessionListView(sessionList, sessionListDiv, enterSession);
 
-            // hide login view
+                    // hide login view
-            document.getElementById("loginContainer").style.display = "none";
+                    document.getElementById("loginContainer").style.display = "none";
 
-            // show session list
+                    // show session list
-            document.getElementById("sessionListContainer").style.display = "";
+                    document.getElementById("sessionListContainer").style.display = "";
+                }
+            );
         }
 
         function loginSuccess(userData) {