diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-05-16 23:11:03 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-05-16 23:11:03 +0000 |
| commit | 83aa0235ab54d27bbdfaa26185a064c154fa676c (patch) | |
| tree | f37b146e51fbf08ef5d1a7bbedbf89152f5d4668 /app/helpers/icons_helper.rb | |
| parent | a14d75ff59b2803452b5ede9498514545303ff1e (diff) | |
| parent | 5b0e086946155aa45b46ebf5010403af40634377 (diff) | |
| download | gitlab-ce-83aa0235ab54d27bbdfaa26185a064c154fa676c.tar.gz | |
Merge branch 'ability_to_cancel_attaching_file' into 'master'
Add an ability to cancel attaching file and redesign attaching files UI
Closes #15611, #24270, and #28905
See merge request !9431
Diffstat (limited to 'app/helpers/icons_helper.rb')
| -rw-r--r-- | app/helpers/icons_helper.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index ef96a554b7e..f29faeca22d 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) |