From 86268cdccdcc9f15398f84b7a9dac7aa81ea143d Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Tue, 17 Sep 2013 14:58:57 +0300 Subject: [PATCH] Move WebODF js code to 3rdparty --- js/{ => 3rdparty/webodf}/dojo-amalgamation.js | 0 js/{ => 3rdparty/webodf}/editor/Editor.js | 0 js/{ => 3rdparty/webodf}/editor/EditorSession.js | 0 js/{ => 3rdparty/webodf}/editor/MemberListView.js | 0 js/{ => 3rdparty/webodf}/editor/Tools.js | 0 js/{ => 3rdparty/webodf}/editor/nls/de/myResources.js | 0 js/{ => 3rdparty/webodf}/editor/nls/dojobundle.js | 0 js/{ => 3rdparty/webodf}/editor/nls/myResources.js | 0 js/{ => 3rdparty/webodf}/editor/nls/ru/myResources.js | 0 js/{ => 3rdparty/webodf}/editor/server/ServerFactory.js | 0 .../webodf}/editor/server/owncloud/ServerFactory.js | 0 .../webodf}/editor/server/pullbox/MemberModel.js | 0 .../webodf}/editor/server/pullbox/OperationRouter.js | 0 js/{ => 3rdparty/webodf}/editor/server/pullbox/Server.js | 0 .../webodf}/editor/server/pullbox/ServerFactory.js | 0 .../webodf}/editor/server/pullbox/SessionList.js | 0 js/{ => 3rdparty/webodf/editor}/webodf.js | 0 .../webodf}/editor/widgets/dialogWidgets/alignmentPane.html | 0 .../webodf}/editor/widgets/dialogWidgets/alignmentPane.js | 0 .../editor/widgets/dialogWidgets/fontEffectsPane.html | 0 .../webodf}/editor/widgets/dialogWidgets/fontEffectsPane.js | 0 js/{ => 3rdparty/webodf}/editor/widgets/fontPicker.js | 0 .../webodf}/editor/widgets/paragraphAlignment.js | 0 js/{ => 3rdparty/webodf}/editor/widgets/paragraphStyles.js | 0 .../webodf}/editor/widgets/paragraphStylesDialog.js | 0 js/{ => 3rdparty/webodf}/editor/widgets/simpleStyles.js | 0 .../webodf}/editor/widgets/toolbarWidgets/currentStyle.js | 0 js/{ => 3rdparty/webodf}/editor/widgets/undoRedoMenu.js | 0 js/{ => 3rdparty/webodf}/editor/widgets/zoomSlider.js | 0 js/{ => 3rdparty/webodf}/webodf-debug.js | 0 js/{ => 3rdparty/webodf}/webodf_bootstrap.js | 2 +- js/documents.js | 6 +++--- 32 files changed, 4 insertions(+), 4 deletions(-) rename js/{ => 3rdparty/webodf}/dojo-amalgamation.js (100%) rename js/{ => 3rdparty/webodf}/editor/Editor.js (100%) rename js/{ => 3rdparty/webodf}/editor/EditorSession.js (100%) rename js/{ => 3rdparty/webodf}/editor/MemberListView.js (100%) rename js/{ => 3rdparty/webodf}/editor/Tools.js (100%) rename js/{ => 3rdparty/webodf}/editor/nls/de/myResources.js (100%) rename js/{ => 3rdparty/webodf}/editor/nls/dojobundle.js (100%) rename js/{ => 3rdparty/webodf}/editor/nls/myResources.js (100%) rename js/{ => 3rdparty/webodf}/editor/nls/ru/myResources.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/ServerFactory.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/owncloud/ServerFactory.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/pullbox/MemberModel.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/pullbox/OperationRouter.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/pullbox/Server.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/pullbox/ServerFactory.js (100%) rename js/{ => 3rdparty/webodf}/editor/server/pullbox/SessionList.js (100%) rename js/{ => 3rdparty/webodf/editor}/webodf.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/dialogWidgets/alignmentPane.html (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/dialogWidgets/alignmentPane.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/dialogWidgets/fontEffectsPane.html (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/dialogWidgets/fontEffectsPane.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/fontPicker.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/paragraphAlignment.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/paragraphStyles.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/paragraphStylesDialog.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/simpleStyles.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/toolbarWidgets/currentStyle.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/undoRedoMenu.js (100%) rename js/{ => 3rdparty/webodf}/editor/widgets/zoomSlider.js (100%) rename js/{ => 3rdparty/webodf}/webodf-debug.js (100%) rename js/{ => 3rdparty/webodf}/webodf_bootstrap.js (86%) diff --git a/js/dojo-amalgamation.js b/js/3rdparty/webodf/dojo-amalgamation.js similarity index 100% rename from js/dojo-amalgamation.js rename to js/3rdparty/webodf/dojo-amalgamation.js diff --git a/js/editor/Editor.js b/js/3rdparty/webodf/editor/Editor.js similarity index 100% rename from js/editor/Editor.js rename to js/3rdparty/webodf/editor/Editor.js diff --git a/js/editor/EditorSession.js b/js/3rdparty/webodf/editor/EditorSession.js similarity index 100% rename from js/editor/EditorSession.js rename to js/3rdparty/webodf/editor/EditorSession.js diff --git a/js/editor/MemberListView.js b/js/3rdparty/webodf/editor/MemberListView.js similarity index 100% rename from js/editor/MemberListView.js rename to js/3rdparty/webodf/editor/MemberListView.js diff --git a/js/editor/Tools.js b/js/3rdparty/webodf/editor/Tools.js similarity index 100% rename from js/editor/Tools.js rename to js/3rdparty/webodf/editor/Tools.js diff --git a/js/editor/nls/de/myResources.js b/js/3rdparty/webodf/editor/nls/de/myResources.js similarity index 100% rename from js/editor/nls/de/myResources.js rename to js/3rdparty/webodf/editor/nls/de/myResources.js diff --git a/js/editor/nls/dojobundle.js b/js/3rdparty/webodf/editor/nls/dojobundle.js similarity index 100% rename from js/editor/nls/dojobundle.js rename to js/3rdparty/webodf/editor/nls/dojobundle.js diff --git a/js/editor/nls/myResources.js b/js/3rdparty/webodf/editor/nls/myResources.js similarity index 100% rename from js/editor/nls/myResources.js rename to js/3rdparty/webodf/editor/nls/myResources.js diff --git a/js/editor/nls/ru/myResources.js b/js/3rdparty/webodf/editor/nls/ru/myResources.js similarity index 100% rename from js/editor/nls/ru/myResources.js rename to js/3rdparty/webodf/editor/nls/ru/myResources.js diff --git a/js/editor/server/ServerFactory.js b/js/3rdparty/webodf/editor/server/ServerFactory.js similarity index 100% rename from js/editor/server/ServerFactory.js rename to js/3rdparty/webodf/editor/server/ServerFactory.js diff --git a/js/editor/server/owncloud/ServerFactory.js b/js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js similarity index 100% rename from js/editor/server/owncloud/ServerFactory.js rename to js/3rdparty/webodf/editor/server/owncloud/ServerFactory.js diff --git a/js/editor/server/pullbox/MemberModel.js b/js/3rdparty/webodf/editor/server/pullbox/MemberModel.js similarity index 100% rename from js/editor/server/pullbox/MemberModel.js rename to js/3rdparty/webodf/editor/server/pullbox/MemberModel.js diff --git a/js/editor/server/pullbox/OperationRouter.js b/js/3rdparty/webodf/editor/server/pullbox/OperationRouter.js similarity index 100% rename from js/editor/server/pullbox/OperationRouter.js rename to js/3rdparty/webodf/editor/server/pullbox/OperationRouter.js diff --git a/js/editor/server/pullbox/Server.js b/js/3rdparty/webodf/editor/server/pullbox/Server.js similarity index 100% rename from js/editor/server/pullbox/Server.js rename to js/3rdparty/webodf/editor/server/pullbox/Server.js diff --git a/js/editor/server/pullbox/ServerFactory.js b/js/3rdparty/webodf/editor/server/pullbox/ServerFactory.js similarity index 100% rename from js/editor/server/pullbox/ServerFactory.js rename to js/3rdparty/webodf/editor/server/pullbox/ServerFactory.js diff --git a/js/editor/server/pullbox/SessionList.js b/js/3rdparty/webodf/editor/server/pullbox/SessionList.js similarity index 100% rename from js/editor/server/pullbox/SessionList.js rename to js/3rdparty/webodf/editor/server/pullbox/SessionList.js diff --git a/js/webodf.js b/js/3rdparty/webodf/editor/webodf.js similarity index 100% rename from js/webodf.js rename to js/3rdparty/webodf/editor/webodf.js diff --git a/js/editor/widgets/dialogWidgets/alignmentPane.html b/js/3rdparty/webodf/editor/widgets/dialogWidgets/alignmentPane.html similarity index 100% rename from js/editor/widgets/dialogWidgets/alignmentPane.html rename to js/3rdparty/webodf/editor/widgets/dialogWidgets/alignmentPane.html diff --git a/js/editor/widgets/dialogWidgets/alignmentPane.js b/js/3rdparty/webodf/editor/widgets/dialogWidgets/alignmentPane.js similarity index 100% rename from js/editor/widgets/dialogWidgets/alignmentPane.js rename to js/3rdparty/webodf/editor/widgets/dialogWidgets/alignmentPane.js diff --git a/js/editor/widgets/dialogWidgets/fontEffectsPane.html b/js/3rdparty/webodf/editor/widgets/dialogWidgets/fontEffectsPane.html similarity index 100% rename from js/editor/widgets/dialogWidgets/fontEffectsPane.html rename to js/3rdparty/webodf/editor/widgets/dialogWidgets/fontEffectsPane.html diff --git a/js/editor/widgets/dialogWidgets/fontEffectsPane.js b/js/3rdparty/webodf/editor/widgets/dialogWidgets/fontEffectsPane.js similarity index 100% rename from js/editor/widgets/dialogWidgets/fontEffectsPane.js rename to js/3rdparty/webodf/editor/widgets/dialogWidgets/fontEffectsPane.js diff --git a/js/editor/widgets/fontPicker.js b/js/3rdparty/webodf/editor/widgets/fontPicker.js similarity index 100% rename from js/editor/widgets/fontPicker.js rename to js/3rdparty/webodf/editor/widgets/fontPicker.js diff --git a/js/editor/widgets/paragraphAlignment.js b/js/3rdparty/webodf/editor/widgets/paragraphAlignment.js similarity index 100% rename from js/editor/widgets/paragraphAlignment.js rename to js/3rdparty/webodf/editor/widgets/paragraphAlignment.js diff --git a/js/editor/widgets/paragraphStyles.js b/js/3rdparty/webodf/editor/widgets/paragraphStyles.js similarity index 100% rename from js/editor/widgets/paragraphStyles.js rename to js/3rdparty/webodf/editor/widgets/paragraphStyles.js diff --git a/js/editor/widgets/paragraphStylesDialog.js b/js/3rdparty/webodf/editor/widgets/paragraphStylesDialog.js similarity index 100% rename from js/editor/widgets/paragraphStylesDialog.js rename to js/3rdparty/webodf/editor/widgets/paragraphStylesDialog.js diff --git a/js/editor/widgets/simpleStyles.js b/js/3rdparty/webodf/editor/widgets/simpleStyles.js similarity index 100% rename from js/editor/widgets/simpleStyles.js rename to js/3rdparty/webodf/editor/widgets/simpleStyles.js diff --git a/js/editor/widgets/toolbarWidgets/currentStyle.js b/js/3rdparty/webodf/editor/widgets/toolbarWidgets/currentStyle.js similarity index 100% rename from js/editor/widgets/toolbarWidgets/currentStyle.js rename to js/3rdparty/webodf/editor/widgets/toolbarWidgets/currentStyle.js diff --git a/js/editor/widgets/undoRedoMenu.js b/js/3rdparty/webodf/editor/widgets/undoRedoMenu.js similarity index 100% rename from js/editor/widgets/undoRedoMenu.js rename to js/3rdparty/webodf/editor/widgets/undoRedoMenu.js diff --git a/js/editor/widgets/zoomSlider.js b/js/3rdparty/webodf/editor/widgets/zoomSlider.js similarity index 100% rename from js/editor/widgets/zoomSlider.js rename to js/3rdparty/webodf/editor/widgets/zoomSlider.js diff --git a/js/webodf-debug.js b/js/3rdparty/webodf/webodf-debug.js similarity index 100% rename from js/webodf-debug.js rename to js/3rdparty/webodf/webodf-debug.js diff --git a/js/webodf_bootstrap.js b/js/3rdparty/webodf/webodf_bootstrap.js similarity index 86% rename from js/webodf_bootstrap.js rename to js/3rdparty/webodf/webodf_bootstrap.js index d6069de3..554dc034 100644 --- a/js/webodf_bootstrap.js +++ b/js/3rdparty/webodf/webodf_bootstrap.js @@ -8,7 +8,7 @@ if (navigator && navigator.language.match(/^(de)/)) { dojoConfig = { locale: usedLocale, paths: { - "webodf/editor": OC.appswebroots.documents + "/js/editor", + "webodf/editor": OC.appswebroots.documents + "/js/3rdparty/webodf/editor", "dijit": OC.appswebroots.documents + "/resources/dijit", "dojox": OC.appswebroots.documents + "/resources/dojox", "dojo": OC.appswebroots.documents + "/resources/dojo", diff --git a/js/documents.js b/js/documents.js index 3c1b9024..436faf7c 100644 --- a/js/documents.js +++ b/js/documents.js @@ -11,8 +11,8 @@ var documentsMain = { "use strict"; documentsMain.mainTitle = $('title').text(); $('
').hide().appendTo(document.body); - OC.addScript('documents', 'dojo-amalgamation', function() { - OC.addScript('documents', 'webodf-debug').done(function() { + OC.addScript('documents', '3rdparty/webodf/dojo-amalgamation', function() { + OC.addScript('documents', '3rdparty/webodf/webodf-debug').done(function() { // preload stuff in the background require({}, ["dojo/ready"], function(ready) { ready(function() { @@ -319,5 +319,5 @@ $(document).ready(function() { //TODO show "no docs, please upload" //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); });