From 6e1a06d07f0193dbd2893239d711c493f3b7e0f8 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 29 Jun 2017 00:27:02 +0200
Subject: [PATCH 1/2] Uses es6  object literal shorthand

---
 app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6 b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
index 6c990548e3a..9ef409b3d4c 100644
--- a/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
+++ b/app/assets/javascripts/discourse/lib/emoji/toolbar.js.es6
@@ -168,9 +168,9 @@ function render(page, offset, options) {
   }
 
   const model = {
-    toolbarItems: toolbarItems,
-    skinTones: skinTones,
-    rows: rows,
+    toolbarItems,
+    skinTones,
+    rows,
     prevDisabled: offset === 0,
     nextDisabled: (max + 1) > icons.length,
     modalClass: options.modalClass

From 65fd92b9915fe6ea1bde4cade79b0d322bc76ae5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Thu, 29 Jun 2017 00:27:16 +0200
Subject: [PATCH 2/2] Fixes glitch on iOS safari

---
 .../javascripts/discourse/templates/emoji-toolbar.raw.hbs     | 4 ++--
 app/assets/stylesheets/common/base/emoji.scss                 | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
index 972ec3729af..fb684b57d67 100644
--- a/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
+++ b/app/assets/javascripts/discourse/templates/emoji-toolbar.raw.hbs
@@ -18,9 +18,9 @@
     <div class='info'></div>
     <div class='tones'>
       {{#each skinTones as |skinTone|}}
-        <button class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
+        <a href='#' class='tones-button {{skinTone.className}}' data-skin-tone="{{skinTone.level}}">
           {{#if skinTone.selected}}{{fa-icon "check"}}{{/if}}
-        </button>
+        </a>
       {{/each}}
     </div>
     <div class='nav'>
diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 7517044c898..10b1a6812b4 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -131,6 +131,7 @@ table.emoji-page td {
   display: flex;
   align-items: center;
   justify-content: center;
+  cursor: pointer;
 }
 .emoji-modal .tones-button.default { background: #ffcc4d; }
 .emoji-modal .tones-button.light { background: #f7dece; }