Merge pull request #92 from owncloud/backport-91

Backport of #91 - Fix regression introduced by 72069f4
owncloud · Jan 20, 2016 · e94c030 · e94c030
2 parents 72069f4 + 7d56944
commit e94c030
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/css/style.css b/css/style.css
@@ -1,4 +1,4 @@
 /* force full height on public template */
-#body-public #content {
-    height: 100%;
+#body-public .full-height {
+	height: 100%;
 }
diff --git a/js/previewplugin.js b/js/previewplugin.js
@@ -28,6 +28,8 @@
 			$('#pdframe').remove();
 			if ($('#isPublic').val() && $('#filesApp').val()){
 				$('#controls').removeClass('hidden');
+				$('#content').removeClass('full-height');
+				$('footer').removeClass('hidden');
 			}
 
 			FileList.setViewerMode(false);
@@ -44,7 +46,7 @@
 			var self = this;
 			var $iframe;
 			var viewer = OC.generateUrl('/apps/files_pdfviewer/?file={file}', {file: downloadUrl});
-			$iframe = $('<iframe id="pdframe" style="width:100%;height:100%;display:block;position:absolute;top:0;" src="'+viewer+'" sandbox="allow-scripts allow-same-origin allow-popups" />');
+			$iframe = $('<iframe id="pdframe" style="width:100%;height:100%;display:block;position:absolute;top:0;" src="'+viewer+'" sandbox="allow-scripts allow-same-origin allow-popups allow-modals" />');
 
 			if(isFileList === true) {
 				FileList.setViewerMode(true);
@@ -54,6 +56,7 @@
 				// force the preview to adjust its height
 				$('#preview').append($iframe).css({height: '100%'});
 				$('body').css({height: '100%'});
+				$('#content').addClass('full-height');
 				$('footer').addClass('hidden');
 				$('#imgframe').addClass('hidden');
 				$('.directLink').addClass('hidden');