Merge pull request #7 from timar/master

upstreamed cloudsuite toolbar
This commit is contained in:
Andras Timar 2016-02-09 22:07:35 +01:00
commit aa50e72c46
3 changed files with 2 additions and 3 deletions

View File

@ -179,7 +179,7 @@ var documentsMain = {
$(document.body).prepend(documentsMain.UI.container); $(document.body).prepend(documentsMain.UI.container);
$('title').text(title + ' - ' + documentsMain.UI.mainTitle); $('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 + 'file_path=' + documentsMain.url +
'&host=' + 'ws://' + window.location.hostname + ':9980' + '&host=' + 'ws://' + window.location.hostname + ':9980' +
'&permission=' + 'view' + '&permission=' + 'view' +

View File

@ -89,7 +89,7 @@ var odfViewer = {
// TODO call something like in the onEdit case; or do we want // TODO call something like in the onEdit case; or do we want
// view-only at all? // 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 + 'file_path=' + context.dir + '/' + filename +
'&host=' + 'ws://' + window.location.hostname + ':9980' + '&host=' + 'ws://' + window.location.hostname + ':9980' +
'&permission=' + 'view' + '&permission=' + 'view' +

View File

@ -26,7 +26,6 @@ BuildArch: noarch
Requires: owncloud Requires: owncloud
Requires: loolwsd Requires: loolwsd
Requires: loleaflet Requires: loleaflet
Requires: cloudsuite
%description %description