From 7a1048956fc5374ff69de07e6309add619118174 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Thu, 17 Jul 2014 12:42:09 +0200 Subject: Fix preview animation on uploading When adding/uploading files, the preview is now animated. When loading a list of files directly the preview is displayed directly. --- apps/files/js/filelist.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'apps/files/js') diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js index 61e73b7bebc..9740cc87ec5 100644 --- a/apps/files/js/filelist.js +++ b/apps/files/js/filelist.js @@ -707,6 +707,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) { @@ -714,7 +715,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 @@ -772,6 +773,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) { @@ -813,7 +815,7 @@ if (fileData.isPreviewAvailable) { // lazy load / newly inserted td ? - if (!fileData.icon) { + if (options.animate) { this.lazyLoadPreview({ path: path + '/' + fileData.name, mime: mime, -- cgit v1.2.3