From c41413234c7a3621565a229a38147a6062d85885 Mon Sep 17 00:00:00 2001
From: Urban Rotnik <urban.rotnik@gmail.com>
Date: Fri, 26 Apr 2019 08:58:01 +0200
Subject: [PATCH] Use MS office icons for MS files

---
 app/helpers/file_icons_helper.rb              | 30 +++++--------------
 .../steps/attachments/_placeholder.html.erb   |  2 +-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/app/helpers/file_icons_helper.rb b/app/helpers/file_icons_helper.rb
index 513bfbf3c..021303b06 100644
--- a/app/helpers/file_icons_helper.rb
+++ b/app/helpers/file_icons_helper.rb
@@ -4,34 +4,20 @@ module FileIconsHelper
     %w(csv ods xls xlsb xlsm xlsx odp pot potm potx pps ppsm ppsx ppt pptm pptx doc docm docx dot dotm dotx odt rtf).include?(file_ext)
   end
 
-  # For showing next to file
   def file_fa_icon_class(asset)
     file_ext = asset.file_file_name.split('.').last
-    if Constants::FILE_TEXT_FORMATS.include?(file_ext)
-      fa_class = 'fa-file-word'
+
+    if Extends::FILE_FA_ICON_MAPPINGS[file_ext] # Check for custom mappings or possible overrides
+      return Extends::FILE_FA_ICON_MAPPINGS[file_ext]
+    elsif Constants::FILE_TEXT_FORMATS.include?(file_ext)
+      return 'fa-file-word'
     elsif Constants::FILE_TABLE_FORMATS.include?(file_ext)
-      fa_class = 'fa-file-excel'
+      return 'fa-file-excel'
     elsif Constants::FILE_PRESENTATION_FORMATS.include?(file_ext)
-      fa_class = 'fa-file-powerpoint'
+      return 'fa-file-powerpoint'
     elsif %w(pdf).include?(file_ext)
-      fa_class = 'fa-file-pdf'
+      return 'fa-file-pdf'
     elsif %w(txt csv tab tex).include?(file_ext)
-      fa_class = 'fa-file-alt'
-    end
-
-    # Now check for custom mappings or possible overrides
-    if Extends::FILE_ICON_MAPPINGS[file_ext]
-      fa_class = Extends::FILE_FA_ICON_MAPPINGS[file_ext]
-    end
-
-    fa_class = 'fa-file' if fa_class.blank?
-    fa_class
-  end
-
-  def file_fa_icon_class_v2(asset)
-    file_ext = asset.file_file_name.split('.').last
-
-    if Constants::FILE_TEXT_FORMATS.include?(file_ext)
       return 'fa-file-alt'
     elsif Constants::WHITELISTED_IMAGE_TYPES.include?(file_ext)
       return 'fa-image'
diff --git a/app/views/steps/attachments/_placeholder.html.erb b/app/views/steps/attachments/_placeholder.html.erb
index 88ffac1cb..ea845e888 100644
--- a/app/views/steps/attachments/_placeholder.html.erb
+++ b/app/views/steps/attachments/_placeholder.html.erb
@@ -5,7 +5,7 @@
     <% if image_preview %>
       <%= image_tag image_preview %>
     <% else %>
-      <i class="fas <%= file_fa_icon_class_v2(asset) if asset.file_file_name %>"></i>
+      <i class="fas <%= file_fa_icon_class(asset) if asset.file_file_name %>"></i>
     <% end %>
   </div>
   <div class="attachment-label"><%= truncate(asset.file_file_name,