From 5bbbeee37d4e5f920a01d25874587b4a01c66c19 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 9 Feb 2016 17:18:51 +0100 Subject: [PATCH 1/2] remove cloudsuite dependency, all is in loleaflet --- owncloud-ccs.spec.in | 1 - 1 file changed, 1 deletion(-) diff --git a/owncloud-ccs.spec.in b/owncloud-ccs.spec.in index 7e0850be..530803cd 100644 --- a/owncloud-ccs.spec.in +++ b/owncloud-ccs.spec.in @@ -26,7 +26,6 @@ BuildArch: noarch Requires: owncloud Requires: loolwsd Requires: loleaflet -Requires: cloudsuite %description From 4afc1ed80a5b2108b028dc18fc21039a2570c3ba Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 9 Feb 2016 17:26:44 +0100 Subject: [PATCH 2/2] changed path of iframe, all is in loleaflet --- js/documents.js | 2 +- js/viewer/viewer.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/documents.js b/js/documents.js index 0a718629..95f0ca7c 100644 --- a/js/documents.js +++ b/js/documents.js @@ -179,7 +179,7 @@ var documentsMain = { $(document.body).prepend(documentsMain.UI.container); $('title').text(title + ' - ' + documentsMain.UI.mainTitle); - var viewer = window.location.protocol + '//' + window.location.host + '/cloudsuite/cloudsuite.html?' + + var viewer = window.location.protocol + '//' + window.location.host + '/loleaflet/dist/loleaflet.html?' + 'file_path=' + documentsMain.url + '&host=' + 'ws://' + window.location.hostname + ':9980' + '&permission=' + 'view' + diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index e4a05223..234f43e5 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -89,7 +89,7 @@ var odfViewer = { // TODO call something like in the onEdit case; or do we want // view-only at all? /* - var viewer = window.location.protocol + '//' + window.location.host + '/cloudsuite/cloudsuite.html?' + + var viewer = window.location.protocol + '//' + window.location.host + '/loleaflet/dist/loleaflet.html?' + 'file_path=' + context.dir + '/' + filename + '&host=' + 'ws://' + window.location.hostname + ':9980' + '&permission=' + 'view' +