summaryrefslogtreecommitdiffstats
path: root/apps/files_pdfviewer
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2012-02-08 16:28:59 +0100
committerRobin Appelman <icewind@owncloud.com>2012-02-08 16:28:59 +0100
commit36d696c30dcd1dbb4f92293fef852a2afc19c156 (patch)
tree1bbacccae7259da3e37425fab90d3c6f387b60e6 /apps/files_pdfviewer
parent5f7727629ad86dfb91c0f27c8f59eb97c100a95d (diff)
downloadnextcloud-server-36d696c30dcd1dbb4f92293fef852a2afc19c156.tar.gz
nextcloud-server-36d696c30dcd1dbb4f92293fef852a2afc19c156.zip
dont load pdfview for ie
Diffstat (limited to 'apps/files_pdfviewer')
-rwxr-xr-xapps/files_pdfviewer/js/viewer.js16
1 files changed, 9 insertions, 7 deletions
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 7f6766c67dd..85bbf09362e 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');
+ }
}
}
});