diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-21 17:15:35 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-21 17:15:35 +0000 |
| commit | e5c56b2433b1987e4b6b8020e01f4da03623c4b8 (patch) | |
| tree | a650870f7bbc497833b8ea00051f9046e1779f5e /apps/files_pdfviewer/js/viewer.js | |
| parent | df83df5263db57056d0bd70edfa3b28e7b5e6b6b (diff) | |
| parent | 6707e4187e4c1186eff8dfe06999c4539ab80de7 (diff) | |
| download | nextcloud-server-e5c56b2433b1987e4b6b8020e01f4da03623c4b8.tar.gz nextcloud-server-e5c56b2433b1987e4b6b8020e01f4da03623c4b8.zip | |
Merge branch 'master' into multi_app_dir
Conflicts:
lib/app.php
lib/base.php
lib/minimizer/css.php
lib/minimizer/js.php
lib/template.php
lib/util.php
Diffstat (limited to 'apps/files_pdfviewer/js/viewer.js')
| -rw-r--r-- | apps/files_pdfviewer/js/viewer.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js index d98bedc5c09..2c9cbb9b431 100644 --- a/apps/files_pdfviewer/js/viewer.js +++ b/apps/files_pdfviewer/js/viewer.js @@ -13,7 +13,7 @@ function hidePDFviewer() { function showPDFviewer(dir,filename){ if(!showPDFviewer.shown){ $("#editor").hide(); - var url = OC.filePath('files','ajax','download.php')+'?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir); + var url = OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(filename)+"&dir="+encodeURIComponent(dir)); $('table').hide(); function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); } showPDFviewer.oldcode = $("#controls").html(); |