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

Use not minified webodf source. Let Assetic do its job

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-10-15 22:25:08 +03:00
parent c7e584f405
commit 7f8c119750
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/documents.js
View File

@ -313,8 +313,7 @@ var documentsMain = {
documentsMain.overlay.documentOverlay('show'); documentsMain.overlay.documentOverlay('show');
} }
var webodfSource = (oc_debug === true) ? 'webodf-debug' : 'webodf'; OC.addScript('documents', '3rdparty/webodf/webodf-debug').done(function() {
OC.addScript('documents', '3rdparty/webodf/' + webodfSource).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() {

5
js/viewer/viewer.js
View File

@ -53,8 +53,7 @@ var odfViewer = {
}, },
onView: function(filename) { onView: function(filename) {
var webodfSource = (oc_debug === true) ? 'webodf-debug' : 'webodf', var attachTo = odfViewer.isDocuments ? '#documents-content' : '#controls',
attachTo = odfViewer.isDocuments ? '#documents-content' : '#controls',
attachToolbarTo = odfViewer.isDocuments ? '#content-wrapper' : '#controls'; attachToolbarTo = odfViewer.isDocuments ? '#content-wrapper' : '#controls';
if (odfViewer.isDocuments){ if (odfViewer.isDocuments){
@ -69,7 +68,7 @@ var odfViewer = {
OC.addStyle('documents', 'viewer/odfviewer'); OC.addStyle('documents', 'viewer/odfviewer');
OC.addScript('documents', '3rdparty/webodf/' + webodfSource, function() { OC.addScript('documents', '3rdparty/webodf/webodf-debug', function() {
FileList.setViewerMode(true); FileList.setViewerMode(true);
// odf action toolbar // odf action toolbar