From 6a69d79defba02a2890dbb6f8d04b45f9431e5bd Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 12 Nov 2015 10:19:33 +0800
Subject: [PATCH 1/2] FIX: Emoji modal height was too short on mobile.

---
 app/assets/stylesheets/common/base/emoji.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/stylesheets/common/base/emoji.scss b/app/assets/stylesheets/common/base/emoji.scss
index 107fbd11afd..c11d9687020 100644
--- a/app/assets/stylesheets/common/base/emoji.scss
+++ b/app/assets/stylesheets/common/base/emoji.scss
@@ -14,7 +14,7 @@ body img.emoji {
   left: 50%;
   top: 50%;
   width: 445px;
-  height: 264px;
+  min-height: 264px;
   margin-top: -132px;
   margin-left: -222px;
   background-color: dark-light-choose(#dadada, blend-primary-secondary(5%));

From bd09faaaed8029c5402a378d2affe480231e845d Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Thu, 12 Nov 2015 10:24:23 +0800
Subject: [PATCH 2/2] FIX: Emoji modal triggered from "more" was broken.

---
 app/assets/javascripts/discourse/components/d-editor.js.es6 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/discourse/components/d-editor.js.es6 b/app/assets/javascripts/discourse/components/d-editor.js.es6
index b10b428a12f..75c21fdf685 100644
--- a/app/assets/javascripts/discourse/components/d-editor.js.es6
+++ b/app/assets/javascripts/discourse/components/d-editor.js.es6
@@ -240,7 +240,7 @@ export default Ember.Component.extend({
           showSelector({
             appendTo: self.$(),
             container,
-            onSelect: title => self._addText(this._getSelected(), `${title}:`)
+            onSelect: title => self._addText(self._getSelected(), `${title}:`)
           });
           return "";
         }