diff options
author | Morris Jobke <hey@morrisjobke.de> | 2014-07-24 14:19:00 +0200 |
---|---|---|
committer | Morris Jobke <hey@morrisjobke.de> | 2014-07-24 14:19:00 +0200 |
commit | fa333c02a0807c6e8347dd1c84381c3584997209 (patch) | |
tree | c40927314d984eafc2f7bf3276abe6b9c86eaab1 /apps/files | |
parent | e2327f83ed60ca29fd1513a40bcefd26e52c54bf (diff) | |
parent | 7a1048956fc5374ff69de07e6309add619118174 (diff) | |
download | nextcloud-server-fa333c02a0807c6e8347dd1c84381c3584997209.tar.gz nextcloud-server-fa333c02a0807c6e8347dd1c84381c3584997209.zip |
Merge pull request #9703 from owncloud/files-preview-animate
[OC 7] Fix preview animation on uploading
Diffstat (limited to 'apps/files')
-rw-r--r-- | apps/files/js/filelist.js | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 4ff7d0c3fa0..4fa8ca65e39 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -712,6 +712,7 @@ * @param options map of attributes: * - "updateSummary": true to update the summary after adding (default), false otherwise * - "silent": true to prevent firing events like "fileActionsReady" + * - "animate": true to animate preview loading (defaults to true here) * @return new tr element (not appended to the table) */ add: function(fileData, options) { @@ -719,7 +720,7 @@ var $tr; var $rows; var $insertionPoint; - options = options || {}; + options = _.extend({animate: true}, options || {}); // there are three situations to cover: // 1) insertion point is visible on the current page @@ -777,6 +778,7 @@ * @param options map of attributes: * - "index" optional index at which to insert the element * - "updateSummary" true to update the summary after adding (default), false otherwise + * - "animate" true to animate the preview rendering * @return new tr element (not appended to the table) */ _renderRow: function(fileData, options) { @@ -818,7 +820,7 @@ if (fileData.isPreviewAvailable) { // lazy load / newly inserted td ? - if (!fileData.icon) { + if (options.animate) { this.lazyLoadPreview({ path: path + '/' + fileData.name, mime: mime, |