diff options
| author | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
|---|---|---|
| committer | VicDeo <dubiniuk@owncloud.com> | 2013-10-07 08:19:40 -0700 |
| commit | d8b7e42fc1626c64a28a31cfbde4a3789b9097bf (patch) | |
| tree | ff67b75013249405357f73d2f35d52302df3aa75 /apps/files/js/files.js | |
| parent | b48dffa9a302881e8d1effe9d03bc97e96adc23b (diff) | |
| parent | 4ccbace68df0150cdadaa8e680a7cb2639e8c628 (diff) | |
| download | nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.tar.gz nextcloud-server-d8b7e42fc1626c64a28a31cfbde4a3789b9097bf.zip | |
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
Diffstat (limited to 'apps/files/js/files.js')
| -rw-r--r-- | apps/files/js/files.js | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/files/js/files.js b/apps/files/js/files.js index 53858d65c65..37b66858840 100644 --- a/apps/files/js/files.js +++ b/apps/files/js/files.js @@ -369,7 +369,7 @@ $(document).ready(function() { } }); } - + //scroll to and highlight preselected file if (getURLParameter('scrollto')) { FileList.scrollTo(getURLParameter('scrollto')); @@ -647,7 +647,7 @@ function lazyLoadPreview(path, mime, ready, width, height) { // get mime icon url getMimeIcon(mime, function(iconURL) { ready(iconURL); // set mimeicon URL - + // now try getting a preview thumbnail URL if ( ! width ) { width = $('#filestable').data('preview-x'); @@ -656,9 +656,9 @@ function lazyLoadPreview(path, mime, ready, width, height) { height = $('#filestable').data('preview-y'); } if( $('#publicUploadButtonMock').length ) { - var previewURL = OC.Router.generate('core_ajax_public_preview', {file: encodeURIComponent(path), x:width, y:height, t:$('#dirToken').val()}); + var previewURL = OC.Router.generate('core_ajax_public_preview', {file: path, x:width, y:height, t:$('#dirToken').val()}); } else { - var previewURL = OC.Router.generate('core_ajax_preview', {file: encodeURIComponent(path), x:width, y:height}); + var previewURL = OC.Router.generate('core_ajax_preview', {file: path, x:width, y:height}); } $.get(previewURL, function() { previewURL = previewURL.replace('(', '%28'); |