From a3348ae6f6a6ab7d927eb6c3c9636a5e2606415d Mon Sep 17 00:00:00 2001
From: Tobias Hintze <th-git@kogmbh.com>
Date: Fri, 19 Jul 2013 00:59:24 +0200
Subject: [PATCH] quasi-update (manual) webodf

---
 js/editor/boot_editor.js | 13 +++++++++----
 js/webodf-debug.js       | 13 +++++++++++--
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/js/editor/boot_editor.js b/js/editor/boot_editor.js
index f758c470..394e2602 100644
--- a/js/editor/boot_editor.js
+++ b/js/editor/boot_editor.js
@@ -86,10 +86,10 @@ var webodfEditor = (function () {
             server = new ops.NowjsServer();
         } else if (backend === "owncloud") {
             runtime.loadClass("ops.PullBoxServer");
-            server = new ops.PullBoxServer({url: "../../ajax/otpoll.php"});
-			server.getGenesisUrl = function(sid) {
-				return "/owncloud/index.php/apps/files/download/welcome.odt";
-			};
+            server = new ops.PullBoxServer({url: "./office/ajax/otpoll.php"});
+            server.getGenesisUrl = function(sid) {
+                return "/owncloud/index.php/apps/files/download/welcome.odt";
+            };
         } else {
             callback("unavailable");
         }
@@ -252,6 +252,11 @@ var webodfEditor = (function () {
         editorOptions.networked = true;
         editorOptions.networkSecurityToken = token;
 
+        // if pre-authentication has happened:
+        if (token) {
+            server.setToken(token);
+        }
+
         require({ }, ["webodf/editor/Editor"],
             function (Editor) {
                 // TODO: the networkSecurityToken needs to be retrieved via now.login
diff --git a/js/webodf-debug.js b/js/webodf-debug.js
index b9c87d59..ae5a8329 100644
--- a/js/webodf-debug.js
+++ b/js/webodf-debug.js
@@ -9136,6 +9136,9 @@ ops.PullBoxServer = function PullBoxServer(args) {
   this.getToken = function() {
     return token
   };
+  this.setToken = function (a_token) {
+  	token = a_token;
+  };
   this.connect = function(timeout, callback) {
     var accumulatedWaitingTime = 0;
     callback("ready")
@@ -10621,6 +10624,7 @@ gui.SelectionMover = function SelectionMover(cursor, rootNode) {
         if(!containerOffset) {
           containerOffset = getOffset(container)
         }
+		runtime.assert(containerOffset, "getRect: invalid containerOffset");
         rect.top = containerOffset.top;
         rect.left = containerOffset.right;
         rect.bottom = containerOffset.bottom
@@ -10639,6 +10643,9 @@ gui.SelectionMover = function SelectionMover(cursor, rootNode) {
         }
       }
     }
+	runtime.assert(rect, "getRect invalid rect");
+	runtime.assert(rect.top !== undefined, "getRect rect without top property");
+
     return{top:rect.top, left:rect.left, bottom:rect.bottom}
   }
   function doMove(steps, extend, move) {
@@ -12642,8 +12649,10 @@ ops.PullBoxOperationRouter = function PullBoxOperationRouter(sessionId, memberId
     triggerPushingOps()
   };
   function init() {
-    var base64 = server.getBase64();
-    server.call("join-session:" + base64.toBase64(server.getToken()) + ":" + base64.toBase64(sessionId) + ":" + base64.toBase64(memberId), function(responseData) {
+    var base64 = server.getBase64(),
+		token = server.getToken();
+	runtime.assert(token, "invalid token");
+    server.call("join-session:" + base64.toBase64(token) + ":" + base64.toBase64(sessionId) + ":" + base64.toBase64(memberId), function(responseData) {
       var response = Boolean(runtime.fromJson(responseData));
       runtime.log("join-session reply: " + responseData);
       runtime.assert(response, "Trying to join a session which does not exists or where we are already in")