Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2018-06-13 16:51:02 +0300
committerAndras Timar <andras.timar@collabora.com>2018-06-13 16:51:02 +0300
commitb2e20bc025948cfa3b42a6664caeb8da42ed68a4 (patch)
tree1771f244ccfc7e990a3e1f444243fb99c190b475
parentfefe15eba91ba4699f685b2b28d8eda448e9df2d (diff)
set scrolling="no" attribute for loleaflet iframe2.0.9
-rw-r--r--js/documents.js2
-rw-r--r--js/viewer/viewer.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/js/documents.js b/js/documents.js
index ad45b667..e1f63be6 100644
--- a/js/documents.js
+++ b/js/documents.js
@@ -401,7 +401,7 @@ var documentsMain = {
'<input name="access_token" value="' + access_token + '" type="hidden"/></form>';
// iframe that contains the Collabora Online
- var frame = '<iframe id="loleafletframe" name= "loleafletframe" allowfullscreen style="width:100%;height:100%;position:absolute;" />';
+ var frame = '<iframe id="loleafletframe" name="loleafletframe" scrolling="no" allowfullscreen style="width:100%;height:100%;position:absolute;" />';
$('#mainContainer').append(form);
$('#mainContainer').append(frame);
diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js
index 64a95430..78eb78a6 100644
--- a/js/viewer/viewer.js
+++ b/js/viewer/viewer.js
@@ -89,7 +89,7 @@ var odfViewer = {
FileList.setViewerMode(true);
}
- var $iframe = $('<iframe id="richdocumentsframe" allowfullscreen style="width:100%;height:100%;display:block;position:absolute;top:0;z-index:60;" src="'+viewer+'" />');
+ var $iframe = $('<iframe id="richdocumentsframe" scrolling="no" allowfullscreen style="width:100%;height:100%;display:block;position:absolute;top:0;z-index:60;" src="'+viewer+'" />');
if ($('#isPublic').val()) {
// force the preview to adjust its height
$('#preview').append($iframe).css({height: '100%'});