summaryrefslogtreecommitdiff
path: root/app/helpers/icons_helper.rb
diff options
context:
space:
mode:
authorblackst0ne <blackst0ne.ru@gmail.com>2017-05-16 19:52:17 +1100
committerblackst0ne <blackst0ne.ru@gmail.com>2017-05-16 19:52:17 +1100
commit5b0e086946155aa45b46ebf5010403af40634377 (patch)
treeb16d5b2d32516fd1c7a924595067a2c02736aa21 /app/helpers/icons_helper.rb
parent20987f4fd2d6a5ab27e61a4afc038999937adade (diff)
downloadgitlab-ce-5b0e086946155aa45b46ebf5010403af40634377.tar.gz
Add an ability to cancel attaching file and redesign attaching files UI
Diffstat (limited to 'app/helpers/icons_helper.rb')
-rw-r--r--app/helpers/icons_helper.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb
index 55fa81e95ef..0c6ce04a4c9 100644
--- a/app/helpers/icons_helper.rb
+++ b/app/helpers/icons_helper.rb
@@ -7,9 +7,10 @@ module IconsHelper
# font-awesome-rails gem, but should we ever use a different icon pack in the
# future we won't have to change hundreds of method calls.
def icon(names, options = {})
- if (options.keys & %w[aria-hidden aria-label]).empty?
- # Add `aria-hidden` if there are no aria's set
+ if (options.keys & %w[aria-hidden aria-label data-hidden]).empty?
+ # Add 'aria-hidden' and 'data-hidden' if they are not set in options.
options['aria-hidden'] = true
+ options['data-hidden'] = true
end
options.include?(:base) ? fa_stacked_icon(names, options) : fa_icon(names, options)