From 7f8c1197503a98832ceccbfbb17b2ac86e54e29e Mon Sep 17 00:00:00 2001 From: Victor Dubiniuk Date: Wed, 15 Oct 2014 22:25:08 +0300 Subject: [PATCH] Use not minified webodf source. Let Assetic do its job --- js/documents.js | 3 +-- js/viewer/viewer.js | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/js/documents.js b/js/documents.js index dc8036a3..425fc0da 100644 --- a/js/documents.js +++ b/js/documents.js @@ -313,8 +313,7 @@ var documentsMain = { documentsMain.overlay.documentOverlay('show'); } - var webodfSource = (oc_debug === true) ? 'webodf-debug' : 'webodf'; - OC.addScript('documents', '3rdparty/webodf/' + webodfSource).done(function() { + OC.addScript('documents', '3rdparty/webodf/webodf-debug').done(function() { // preload stuff in the background require({}, ["dojo/ready"], function(ready) { ready(function() { diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index 12aa7e35..230cec29 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -53,8 +53,7 @@ var odfViewer = { }, onView: function(filename) { - var webodfSource = (oc_debug === true) ? 'webodf-debug' : 'webodf', - attachTo = odfViewer.isDocuments ? '#documents-content' : '#controls', + var attachTo = odfViewer.isDocuments ? '#documents-content' : '#controls', attachToolbarTo = odfViewer.isDocuments ? '#content-wrapper' : '#controls'; if (odfViewer.isDocuments){ @@ -69,7 +68,7 @@ var odfViewer = { OC.addStyle('documents', 'viewer/odfviewer'); - OC.addScript('documents', '3rdparty/webodf/' + webodfSource, function() { + OC.addScript('documents', '3rdparty/webodf/webodf-debug', function() { FileList.setViewerMode(true); // odf action toolbar