Move WebODF js code to 3rdparty

This commit is contained in:
Victor Dubiniuk 2013-09-17 14:58:57 +03:00
parent 4ded21f3ac
commit 86268cdccd
32 changed files with 4 additions and 4 deletions

View File

@ -8,7 +8,7 @@ if (navigator && navigator.language.match(/^(de)/)) {
dojoConfig = { dojoConfig = {
locale: usedLocale, locale: usedLocale,
paths: { paths: {
"webodf/editor": OC.appswebroots.documents + "/js/editor", "webodf/editor": OC.appswebroots.documents + "/js/3rdparty/webodf/editor",
"dijit": OC.appswebroots.documents + "/resources/dijit", "dijit": OC.appswebroots.documents + "/resources/dijit",
"dojox": OC.appswebroots.documents + "/resources/dojox", "dojox": OC.appswebroots.documents + "/resources/dojox",
"dojo": OC.appswebroots.documents + "/resources/dojo", "dojo": OC.appswebroots.documents + "/resources/dojo",

View File

@ -11,8 +11,8 @@ var documentsMain = {
"use strict"; "use strict";
documentsMain.mainTitle = $('title').text(); documentsMain.mainTitle = $('title').text();
$('<div id="documents-overlay"></div> <div id="documents-overlay-below"></div>').hide().appendTo(document.body); $('<div id="documents-overlay"></div> <div id="documents-overlay-below"></div>').hide().appendTo(document.body);
OC.addScript('documents', 'dojo-amalgamation', function() { OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', function() {
OC.addScript('documents', 'webodf-debug').done(function() { OC.addScript('documents', '3rdparty/webodf/webodf-debug').done(function() {
// preload stuff in the background // preload stuff in the background
require({}, ["dojo/ready"], function(ready) { require({}, ["dojo/ready"], function(ready) {
ready(function() { ready(function() {
@ -319,5 +319,5 @@ $(document).ready(function() {
//TODO show "no docs, please upload" //TODO show "no docs, please upload"
//TODO when ending a session as the last user close session? //TODO when ending a session as the last user close session?
OC.addScript('documents', 'webodf_bootstrap', documentsMain.onStartup); OC.addScript('documents', '3rdparty/webodf/webodf_bootstrap', documentsMain.onStartup);
}); });