summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorRoeland Jago Douma <rullzer@users.noreply.github.com>2017-04-28 12:50:38 +0200
committerGitHub <noreply@github.com>2017-04-28 12:50:38 +0200
commit3e8c5441f74cacdc40ae1489438f5059bcae95bc (patch)
tree2b573cecfbe13556fc2241cd432d50b80662dca3 /core
parentec272f3ac357539ca0ca44c2b05c8771061cd789 (diff)
parentc42278b651df84c79ab23d0cfb07afb311c7c968 (diff)
downloadnextcloud-server-3e8c5441f74cacdc40ae1489438f5059bcae95bc.tar.gz
nextcloud-server-3e8c5441f74cacdc40ae1489438f5059bcae95bc.zip
Merge pull request #4521 from nextcloud/custom-mount-types
allow apps to set custom mount types
Diffstat (limited to 'core')
-rw-r--r--core/js/files/client.js11
1 files changed, 10 insertions, 1 deletions
diff --git a/core/js/files/client.js b/core/js/files/client.js
index cde3afde9d7..e8cf5b9bdb4 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -114,7 +114,11 @@
/**
* Preview availability
*/
- [Client.NS_NEXTCLOUD, 'has-preview']
+ [Client.NS_NEXTCLOUD, 'has-preview'],
+ /**
+ * Mount type
+ */
+ [Client.NS_NEXTCLOUD, 'mount-type'],
];
/**
@@ -361,6 +365,11 @@
}
}
+ var mounTypeProp = props['{' + Client.NS_NEXTCLOUD + '}mount-type'];
+ if (!_.isUndefined(mounTypeProp)) {
+ data.mountType = mounTypeProp;
+ }
+
// extend the parsed data using the custom parsers
_.each(this._fileInfoParsers, function(parserFunction) {
_.extend(data, parserFunction(response) || {});