From 5cfea26265932c08ac05d014808a259de5e1753c Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Thu, 13 Mar 2014 00:14:51 +0300 Subject: [PATCH] Move ServerFactory downstream. Closes #221 --- .../webodf/editor/server/owncloud => }/ServerFactory.js | 2 +- js/documents.js | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) rename js/{3rdparty/webodf/editor/server/owncloud => }/ServerFactory.js (97%) diff --git a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js b/js/ServerFactory.js similarity index 97% rename from js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js rename to js/ServerFactory.js index 2c25c49b..7c37949b 100644 --- a/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js +++ b/js/ServerFactory.js @@ -25,7 +25,7 @@ /*global define, require, OC*/ -define("webodf/editor/server/owncloud/ServerFactory", [ +define("owncloud/ServerFactory", [ "webodf/editor/server/pullbox/Server", "webodf/editor/server/pullbox/OperationRouter", "webodf/editor/server/pullbox/SessionList"], diff --git a/js/documents.js b/js/documents.js index b54b35bc..c6ba7acc 100644 --- a/js/documents.js +++ b/js/documents.js @@ -198,7 +198,7 @@ var documentsMain = { return; } - require({ }, ["webodf/editor/server/owncloud/ServerFactory", "webodf/editor/Editor"], function (ServerFactory, Editor) { + require({ }, ["owncloud/ServerFactory", "webodf/editor/Editor"], function (ServerFactory, Editor) { // fade out file list and show WebODF canvas $('#content').fadeOut('fast').promise().done(function() { @@ -530,7 +530,8 @@ dojoConfig = { "dijit": OC.appswebroots.documents + "/js/3rdparty/resources/dijit", "dojox": OC.appswebroots.documents + "/js/3rdparty/resources/dojox", "dojo": OC.appswebroots.documents + "/js/3rdparty/resources/dojo", - "resources": OC.appswebroots.documents + "/js/3rdparty/resources" + "resources": OC.appswebroots.documents + "/js/3rdparty/resources", + "owncloud" : OC.appswebroots.documents + "/js" } };