[pdf_viewer] fixes owncloud-archive#252

Conflicts: files_pdfviewer/js/loader.js
danielfh · Dec 27, 2012 · d82aa63 · d82aa63
1 parent e6fe9d5
commit d82aa63
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/files_pdfviewer/js/loader.js b/files_pdfviewer/js/loader.js
@@ -9,11 +9,10 @@ function hidePDFviewer() {
 function showPDFviewer(dir,filename){
 	if(!showPDFviewer.shown){
 		$("#editor").hide();
-		var url = fileDownloadPath(dir, filename);
 		$('#content table').hide();
 		$("#controls").hide();
 		var oldcontent = $("#content").html();
-		var viewer = OC.linkTo('files_pdfviewer','viewer.php')+'?dir='+dir+'&file='+filename;
+        var viewer = OC.linkTo('files_pdfviewer', 'viewer.php')+'?dir='+encodeURIComponent(dir).replace(/%2F/g, '/')+'&file='+encodeURIComponent(filename);
 		$("#content").html(oldcontent+'<iframe style="width:100%;height:100%;display:block;" src="'+viewer+'" />');
 		$("#pageWidthOption").attr("selected","selected");
 	}

diff --git a/files_pdfviewer/js/pdf/viewer.js b/files_pdfviewer/js/pdf/viewer.js
@@ -1846,7 +1846,7 @@ document.addEventListener('DOMContentLoaded', function webViewerLoad(evt) {
     });
 
 
-    PDFView.open(oc_webroot+"/?app=files&getfile=download.php?file="+window.dir+"/"+window.file, 1.0);
+    PDFView.open(oc_webroot+"/?app=files&getfile=download.php?file="+encodeURIComponent(window.dir)+"/"+encodeURIComponent(window.file), 1.0);
 }, true);
 
 function updateViewarea() {