summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2016-10-25 08:22:33 +0200
committerGitHub <noreply@github.com>2016-10-25 08:22:33 +0200
commit60fa82d92fe6ac911a8b45350c74dd0bde4490f8 (patch)
treed392ff247dc700c11da855254822aa5b4c5923c8 /core
parent44e9f5d5a17337458c74f285c7b53a92df7e76da (diff)
parent3e96f33995c522106b645908b4537b25536b8a7d (diff)
downloadnextcloud-server-60fa82d92fe6ac911a8b45350c74dd0bde4490f8.tar.gz
nextcloud-server-60fa82d92fe6ac911a8b45350c74dd0bde4490f8.zip
Merge pull request #1860 from ryanwr/feature-sort-favorite
Sort favorite files first
Diffstat (limited to 'core')
-rw-r--r--core/js/files/client.js7
-rw-r--r--core/js/files/fileinfo.js7
2 files changed, 13 insertions, 1 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 572f7879e17..ee3efbd5517 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -287,6 +287,13 @@
data.hasPreview = true;
}
+ var isFavorite = props['{' + Client.NS_OWNCLOUD + '}favorite'];
+ if (!_.isUndefined(isFavorite)) {
+ data.isFavorite = isFavorite === '1';
+ } else {
+ data.isFavorite = false;
+ }
+
var contentType = props['{' + Client.NS_DAV + '}getcontenttype'];
if (!_.isUndefined(contentType)) {
data.mimetype = contentType;
diff --git a/core/js/files/fileinfo.js b/core/js/files/fileinfo.js
index 1fc239da47a..7c8e4586448 100644
--- a/core/js/files/fileinfo.js
+++ b/core/js/files/fileinfo.js
@@ -132,7 +132,12 @@
/**
* @type boolean
*/
- hasPreview: true
+ hasPreview: true,
+
+ /**
+ * @type boolean
+ */
+ isFavorite: false
};
if (!OC.Files) {