From 36d696c30dcd1dbb4f92293fef852a2afc19c156 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Wed, 8 Feb 2012 16:28:59 +0100 Subject: [PATCH] dont load pdfview for ie --- apps/files_pdfviewer/js/viewer.js | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js index 7f6766c67d..85bbf09362 100755 --- a/apps/files_pdfviewer/js/viewer.js +++ b/apps/files_pdfviewer/js/viewer.js @@ -49,13 +49,15 @@ showPDFviewer.lastTitle=''; showPDFviewer.loaded=false; $(document).ready(function(){ - if(location.href.indexOf("files")!=-1) { - PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js'); - if(typeof FileActions!=='undefined'){ - FileActions.register('application/pdf','Edit','',function(filename){ - showPDFviewer($('#dir').val(),filename); - }); - FileActions.setDefault('application/pdf','Edit'); + if(!$.browser.msie){//doesnt work on IE + if(location.href.indexOf("files")!=-1) { + PDFJS.workerSrc = OC.filePath('files_pdfviewer','js','pdfjs/build/pdf.js'); + if(typeof FileActions!=='undefined'){ + FileActions.register('application/pdf','Edit','',function(filename){ + showPDFviewer($('#dir').val(),filename); + }); + FileActions.setDefault('application/pdf','Edit'); + } } } });