be56374c51
The sort comparator checks the "isFavorite" property of the FileInfo objects to compare. That property is set when the file list is loaded and the response from the server is parsed, and thus a freshly loaded file list has the proper sorting for favorite files. However, the property is not set in other cases, like when the FileInfo objects are derived from FileInfoModels due to a file being marked as a favorite or a text editor being closed, which causes the file to be sorted in the wrong position. There is no need to add the property in those situations, though; in all cases the TagsPlugin adds a "tags" array property that contains an OC.TAG_FAVORITE tag, so that tag can be checked instead of "isFavorite". Moreover, although "isFavorite" was added by the main "_parseFileInfo" function it did not really belong there but to the "FileInfoParser" from the TagsPlugin; however, as that property now is not used anywhere it was removed altogether. A cleaner solution would have been to make the sort comparator extensible by plugins like other behaviours of the file list and then add the sorting logic related to favorite files to the TagsPlugin. However, right now only the TagsPlugin would need to alter the main sorting logic, and it seems like a corner case anyway. Even if it is implemented as a plugin, favorite files is a core feature, so for the time being it will be taken into account directly in the main sorting logic; making the sort comparator extensible by plugins is defered until there are other use cases for that. Fixes #5410 Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
143 lines
2 KiB
JavaScript
143 lines
2 KiB
JavaScript
/*
|
|
* Copyright (c) 2015
|
|
*
|
|
* This file is licensed under the Affero General Public License version 3
|
|
* or later.
|
|
*
|
|
* See the COPYING-README file.
|
|
*
|
|
*/
|
|
|
|
(function(OC) {
|
|
|
|
/**
|
|
* @class OC.Files.FileInfo
|
|
* @classdesc File information
|
|
*
|
|
* @param {Object} data file data, see attributes for details
|
|
*
|
|
* @since 8.2
|
|
*/
|
|
var FileInfo = function(data) {
|
|
var self = this;
|
|
_.each(data, function(value, key) {
|
|
if (!_.isFunction(value)) {
|
|
self[key] = value;
|
|
}
|
|
});
|
|
|
|
if (!_.isUndefined(this.id)) {
|
|
this.id = parseInt(data.id, 10);
|
|
}
|
|
|
|
// TODO: normalize path
|
|
this.path = data.path || '';
|
|
|
|
if (this.type === 'dir') {
|
|
this.mimetype = 'httpd/unix-directory';
|
|
} else {
|
|
this.mimetype = this.mimetype || 'application/octet-stream';
|
|
}
|
|
|
|
if (!this.type) {
|
|
if (this.mimetype === 'httpd/unix-directory') {
|
|
this.type = 'dir';
|
|
} else {
|
|
this.type = 'file';
|
|
}
|
|
}
|
|
};
|
|
|
|
/**
|
|
* @memberof OC.Files
|
|
*/
|
|
FileInfo.prototype = {
|
|
/**
|
|
* File id
|
|
*
|
|
* @type int
|
|
*/
|
|
id: null,
|
|
|
|
/**
|
|
* File name
|
|
*
|
|
* @type String
|
|
*/
|
|
name: null,
|
|
|
|
/**
|
|
* Path leading to the file, without the file name,
|
|
* and with a leading slash.
|
|
*
|
|
* @type String
|
|
*/
|
|
path: null,
|
|
|
|
/**
|
|
* Mime type
|
|
*
|
|
* @type String
|
|
*/
|
|
mimetype: null,
|
|
|
|
/**
|
|
* Icon URL.
|
|
*
|
|
* Can be used to override the mime type icon.
|
|
*
|
|
* @type String
|
|
*/
|
|
icon: null,
|
|
|
|
/**
|
|
* File type. 'file' for files, 'dir' for directories.
|
|
*
|
|
* @type String
|
|
* @deprecated rely on mimetype instead
|
|
*/
|
|
type: null,
|
|
|
|
/**
|
|
* Permissions.
|
|
*
|
|
* @see OC#PERMISSION_ALL for permissions
|
|
* @type int
|
|
*/
|
|
permissions: null,
|
|
|
|
/**
|
|
* Modification time
|
|
*
|
|
* @type int
|
|
*/
|
|
mtime: null,
|
|
|
|
/**
|
|
* Etag
|
|
*
|
|
* @type String
|
|
*/
|
|
etag: null,
|
|
|
|
/**
|
|
* Mount type.
|
|
*
|
|
* One of null, "external-root", "shared" or "shared-root"
|
|
*
|
|
* @type string
|
|
*/
|
|
mountType: null,
|
|
|
|
/**
|
|
* @type boolean
|
|
*/
|
|
hasPreview: true
|
|
};
|
|
|
|
if (!OC.Files) {
|
|
OC.Files = {};
|
|
}
|
|
OC.Files.FileInfo = FileInfo;
|
|
})(OC);
|
|
|