From 5c381ea5326501e316704b642aa5b82acd45b20b Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 8 Jul 2015 14:55:11 +0200
Subject: Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl

---
 core/js/oc-dialogs.js | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'core/js/oc-dialogs.js')

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);
-- 
cgit v1.2.3