From 1ca0c33802e71a5dc3bf00f23dca241ea4ac35a5 Mon Sep 17 00:00:00 2001
From: Joffrey JAFFEUX <j.jaffeux@gmail.com>
Date: Fri, 21 Jul 2017 12:01:39 +0200
Subject: [PATCH] FIX: dot not close emoji-picker when click is inside picker

---
 .../javascripts/discourse/components/emoji-picker.js.es6      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
index cf9c2d704b1..76b730a97c1 100644
--- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6
+++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6
@@ -148,7 +148,9 @@ export default Ember.Component.extend({
         .on("click", () => this.set("active", false));
 
     this.$(document).on("click.emoji-picker", (event) => {
-      if(event.target.className.indexOf("grippie") === -1) {
+      const onPicker = $(event.target).parents(".emoji-picker").length === 1;
+      const onGrippie = event.target.className.indexOf("grippie") > -1;
+      if(!onPicker && !onGrippie) {
         this.set("active", false);
         return false;
       }