diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2013-09-11 17:18:04 -0700 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2013-09-11 17:18:04 -0700 |
| commit | b7205d97d7797daf057d47a5a07d2bad3b0db4da (patch) | |
| tree | 524080f4643ddcb1c76a1159e0bbc15cd0bcd3d7 /core | |
| parent | 80bf1969f97fca3d2cb5f9edd6ad09115728497a (diff) | |
| parent | 4d62f747fadaea09c9f8a25cf24c2b6d12f7ee2a (diff) | |
| download | nextcloud-server-b7205d97d7797daf057d47a5a07d2bad3b0db4da.tar.gz nextcloud-server-b7205d97d7797daf057d47a5a07d2bad3b0db4da.zip | |
Merge pull request #4735 from owncloud/multiple_mimetypes_rawlist
Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/oc-dialogs.js | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index f184a1022bc..61b58d00fa6 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -244,9 +244,16 @@ var OCdialogs = { return defer.promise(); }, _getFileList: function(dir, mimeType) { + if (typeof(mimeType) === "string") { + mimeType = [mimeType]; + } + return $.getJSON( OC.filePath('files', 'ajax', 'rawlist.php'), - {dir: dir, mimetype: mimeType} + { + dir: dir, + mimetypes: JSON.stringify(mimeType) + } ); }, _determineValue: function(element) { |