mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9703 from owncloud/files-preview-animate 

[OC 7] Fix preview animation on uploading
This commit is contained in:
Morris Jobke 2014-07-24 14:19:00 +02:00
parent e2327f83ed 7a1048956f
commit fa333c02a0
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/files/js/filelist.js
View File

@ -712,6 +712,7 @@
* @param options map of attributes: * @param options map of attributes:
* - "updateSummary": true to update the summary after adding (default), false otherwise * - "updateSummary": true to update the summary after adding (default), false otherwise
* - "silent": true to prevent firing events like "fileActionsReady" * - "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) * @return new tr element (not appended to the table)
*/ */
add: function(fileData, options) { add: function(fileData, options) {
@ -719,7 +720,7 @@
var $tr; var $tr;
var $rows; var $rows;
var $insertionPoint; var $insertionPoint;
options = options || {}; options = _.extend({animate: true}, options || {});
// there are three situations to cover: // there are three situations to cover:
// 1) insertion point is visible on the current page // 1) insertion point is visible on the current page
@ -777,6 +778,7 @@
* @param options map of attributes: * @param options map of attributes:
* - "index" optional index at which to insert the element * - "index" optional index at which to insert the element
* - "updateSummary" true to update the summary after adding (default), false otherwise * - "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) * @return new tr element (not appended to the table)
*/ */
_renderRow: function(fileData, options) { _renderRow: function(fileData, options) {
@ -818,7 +820,7 @@
if (fileData.isPreviewAvailable) { if (fileData.isPreviewAvailable) {
// lazy load / newly inserted td ? // lazy load / newly inserted td ?
if (!fileData.icon) { if (options.animate) {
this.lazyLoadPreview({ this.lazyLoadPreview({
path: path + '/' + fileData.name, path: path + '/' + fileData.name,
mime: mime, mime: mime,

1
apps/files_sharing/js/sharedfilelist.js
View File

@ -162,7 +162,6 @@
else { else {
file.type = 'file'; file.type = 'file';
if (share.isPreviewAvailable) { if (share.isPreviewAvailable) {
file.icon = true;
file.isPreviewAvailable = true; file.isPreviewAvailable = true;
} }
} }