diff options
| author | Roeland Douma <rullzer@users.noreply.github.com> | 2016-01-18 13:30:27 +0100 |
|---|---|---|
| committer | Roeland Douma <rullzer@users.noreply.github.com> | 2016-01-18 13:30:27 +0100 |
| commit | 57d9e2b2b78354384c45b62573fb7ddf597fdbd3 (patch) | |
| tree | d8b8505c21506c649ea96b1a35e119a7bcb97fb5 | |
| parent | e4d5229940526352378f0141de4c9a6fd53611a9 (diff) | |
| parent | 50557b19b6d65a5a3acbed3edbcd6bae24a49183 (diff) | |
| download | nextcloud-server-57d9e2b2b78354384c45b62573fb7ddf597fdbd3.tar.gz nextcloud-server-57d9e2b2b78354384c45b62573fb7ddf597fdbd3.zip | |
Merge pull request #21769 from owncloud/sort-mimetype-list-before-saving
Sort mimetype list before saving
| -rw-r--r-- | core/command/maintenance/mimetype/updatejs.php | 2 | ||||
| -rw-r--r-- | core/js/mimetypelist.js | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/core/command/maintenance/mimetype/updatejs.php b/core/command/maintenance/mimetype/updatejs.php index e93b563d5fb..8ee06e8cdc9 100644 --- a/core/command/maintenance/mimetype/updatejs.php +++ b/core/command/maintenance/mimetype/updatejs.php @@ -71,6 +71,7 @@ class UpdateJS extends Command { //Remove duplicates $files = array_values(array_unique($files)); + sort($files); // Fetch all themes! $themes = []; @@ -100,6 +101,7 @@ class UpdateJS extends Command { //Remove Duplicates $themes[$theme] = array_values(array_unique($themes[$theme])); + sort($themes[$theme]); } //Generate the JS diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js index 43f01273f55..dea065814d1 100644 --- a/core/js/mimetypelist.js +++ b/core/js/mimetypelist.js @@ -82,26 +82,26 @@ OC.MimeTypeList={ "web": "text/code" }, files: [ - "video", + "application", + "application-pdf", + "audio", + "file", + "folder", "folder-drag-accept", - "folder-starred", + "folder-external", "folder-public", + "folder-shared", + "folder-starred", + "image", "package-x-generic", "text", - "folder-external", - "text-vcard", - "application", + "text-calendar", "text-code", - "x-office-spreadsheet", - "application-pdf", - "folder", + "text-vcard", + "video", "x-office-document", - "text-calendar", "x-office-presentation", - "file", - "folder-shared", - "image", - "audio" + "x-office-spreadsheet" ], themes: [] }; |