diff options
| author | Jacob Schatz <jschatz@gitlab.com> | 2016-06-03 19:46:03 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz@gitlab.com> | 2016-06-03 19:46:03 +0000 |
| commit | 9aca0a1f96d0480ff61c92603acb2d6a987dd271 (patch) | |
| tree | 2be34cadd3412b083dca9f6892a61d6d5c789430 | |
| parent | 8bb57e70cd0e8aa76f8c0a44f2a37c4dab88ec82 (diff) | |
| parent | f9cc619c7c705619e85f6f1af4fc03f28e52c525 (diff) | |
| download | gitlab-ce-9aca0a1f96d0480ff61c92603acb2d6a987dd271.tar.gz | |
Merge branch 'no-spritesheet' into 'master'
The spritesheet should only load when an award emoji picker is opened.
This makes sure that the emoji spritesheet is loaded **only** when the emoji picker is opened. This saves 250-650KB on every page load.
Prevents !3785 from reverting the fix from !3449.
cc: @jschatz1 @zj @fatihacet
See merge request !4469
| -rw-r--r-- | app/views/award_emoji/_awards_block.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/award_emoji/_awards_block.html.haml b/app/views/award_emoji/_awards_block.html.haml index f1f93c1375b..e9302c39753 100644 --- a/app/views/award_emoji/_awards_block.html.haml +++ b/app/views/award_emoji/_awards_block.html.haml @@ -2,7 +2,7 @@ .awards.js-awards-block{ class: ("hidden" if !inline && grouped_emojis.empty?), data: { award_url: url_for([:toggle_award_emoji, @project.namespace.becomes(Namespace), @project, awardable]) } } - awards_sort(grouped_emojis).each do |emoji, awards| %button.btn.award-control.js-emoji-btn.has-tooltip{ type: "button", class: (award_active_class(awards, current_user)), data: { placement: "bottom", title: award_user_list(awards, current_user) } } - = emoji_icon(emoji) + = emoji_icon(emoji, sprite: false) %span.award-control-text.js-counter = awards.count |