make pdf viewer work a bit better with the rest of owncloud

1 files changed, 17 insertions, 4 deletions

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 314a08b27e6..03288ebe420 100755
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -5,6 +5,7 @@ function hidePDFviewer() {
 	$("#viewer").remove();
 	$("#loading").remove()
 	document.title = showPDFviewer.lastTitle;
+	PDFView.active=false;
 }
 
 function showPDFviewer(dir,filename){
@@ -21,8 +22,21 @@ function showPDFviewer(dir,filename){
 		var oldcontent = $("#content").html();
 		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
 		showPDFviewer.lastTitle = document.title;
-		PDFView.Ptitle = filename;
-		PDFView.open(url,1.00);
+		if(!showPDFviewer.loaded){
+			OC.addScript( 'files_pdfviewer', 'pdfjs/build/pdf',function(){
+				OC.addScript( 'files_pdfviewer', 'pdfview',function(){
+					showPDFviewer.loaded=true;
+					PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js');
+					PDFView.Ptitle = filename;
+					PDFView.open(url,1.00);
+					PDFView.active=true;
+				});
+			});
+		}else{
+			PDFView.Ptitle = filename;
+			PDFView.open(url,1.00);
+			PDFView.active=true;
+		}
 		$("#pageWidthOption").attr("selected","selected");
 		showPDFviewer.shown = true;
 	}
@@ -30,8 +44,7 @@ function showPDFviewer(dir,filename){
 showPDFviewer.shown=false;
 showPDFviewer.oldCode='';
 showPDFviewer.lastTitle='';
-
-var extrahtml = '<li id="extra" style="display:none;"><a title="" href="'+OC.webroot+"/apps/files_pdfviewer/lastopened.php"+'" style="background-image:url(/owncloud/apps/files_pdfviewer/css/history.png)">Last opened</a></li>';
+showPDFviewer.loaded=false;
 
 $(document).ready(function(){
 	if(location.href.indexOf("files")!=-1) {