diff options
| author | Vincent Petry <pvince81@owncloud.com> | 2015-07-10 10:14:03 +0200 |
|---|---|---|
| committer | Vincent Petry <pvince81@owncloud.com> | 2015-07-10 10:14:03 +0200 |
| commit | 87f3500fda04f76d97754185a71f285e9770c66c (patch) | |
| tree | 8fd76813636a7ec3fdbce7565dd7fe2ba38e2e92 /core | |
| parent | 176dabd9766a2b298ad3adf9e4e5338aecccc201 (diff) | |
| parent | eb7a796ad98ec833e49c2544f03da52d11c302b1 (diff) | |
| download | nextcloud-server-87f3500fda04f76d97754185a71f285e9770c66c.tar.gz nextcloud-server-87f3500fda04f76d97754185a71f285e9770c66c.zip | |
Merge pull request #17483 from rullzer/migrate-mimetype-js
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/mimetypelist.js | 1 | ||||
| -rw-r--r-- | core/js/oc-dialogs.js | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/core/js/mimetypelist.js b/core/js/mimetypelist.js index 2a780fc2bcb..b4de98247d1 100644 --- a/core/js/mimetypelist.js +++ b/core/js/mimetypelist.js @@ -64,6 +64,7 @@ OC.MimeTypeList={ "application/xml": "text/html", "application/yaml": "text/code", "application/zip": "package/x-generic", + "httpd/unix-directory": "dir", "image/svg+xml": "image/vector", "text/css": "text/code", "text/csv": "x-office/spreadsheet", diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js index 9f88c268369..52ed34f61ec 100644 --- a/core/js/oc-dialogs.js +++ b/core/js/oc-dialogs.js @@ -396,9 +396,8 @@ var OCdialogs = { function(path){ $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); }, function(){ - Files.getMimeIcon(replacement.type,function(path){ - $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); - }); + path = OC.MimeType.getIconUrl(replacement.type); + $replacementDiv.find('.icon').css('background-image','url(' + path + ')'); } ); $conflicts.append($conflict); |