DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update webodf

Browse Source
This commit is contained in:
Tobias Hintze 2013-07-18 17:47:17 +02:00
parent 7e8715a785
commit 33d8b1bd8f
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/editor/Editor.js
View File

@ -264,7 +264,7 @@ define("webodf/editor/Editor", [
* @param {?function()} editorReadyCallback * @param {?function()} editorReadyCallback
*/ */
self.loadSession = function (sessionId, editorReadyCallback) { self.loadSession = function (sessionId, editorReadyCallback) {
initGuiAndDoc("/session/" + sessionId + "/genesis", function () { initGuiAndDoc(server.getGenesisUrl(sessionId), function () {
// get router and user model // get router and user model
opRouter = opRouter || server.createOperationRouter(sessionId, memberid); opRouter = opRouter || server.createOperationRouter(sessionId, memberid);
session.setOperationRouter(opRouter); session.setOperationRouter(opRouter);

3
js/editor/boot_editor.js
View File

@ -87,6 +87,9 @@ var webodfEditor = (function () {
} else if (backend === "owncloud") { } else if (backend === "owncloud") {
runtime.loadClass("ops.PullBoxServer"); runtime.loadClass("ops.PullBoxServer");
server = new ops.PullBoxServer({url: "../../ajax/otpoll.php"}); server = new ops.PullBoxServer({url: "../../ajax/otpoll.php"});
server.getGenesisUrl = function(sid) {
return "/owncloud/index.php/apps/files/download/welcome.odt";
};
} else { } else {
callback("unavailable"); callback("unavailable");
} }

6
js/webodf-debug.js
View File

@ -9003,6 +9003,9 @@ ops.NowjsServer = function NowjsServer() {
function createUserModel() { function createUserModel() {
return new ops.NowjsUserModel(self) return new ops.NowjsUserModel(self)
} }
function getGenesisUrl(sessionId) {
return"/session/" + sessionId + "/genesis"
}
this.connect = function(timeout, callback) { this.connect = function(timeout, callback) {
var accumulatedWaitingTime = 0; var accumulatedWaitingTime = 0;
if(nowObject) { if(nowObject) {
@ -9092,6 +9095,9 @@ ops.PullBoxServer = function PullBoxServer(args) {
function createUserModel() { function createUserModel() {
return new ops.PullBoxUserModel(self) return new ops.PullBoxUserModel(self)
} }
function getGenesisUrl(sessionId) {
return"/session/" + sessionId + "/genesis"
}
function call(message, cb) { function call(message, cb) {
var xhr = new XMLHttpRequest, byteArrayWriter = new core.ByteArrayWriter("utf8"), data; var xhr = new XMLHttpRequest, byteArrayWriter = new core.ByteArrayWriter("utf8"), data;
function handleResult() { function handleResult() {