From 4ef52d5e883d81dc192cfd87d688bc076189caf0 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Wed, 19 Jul 2017 13:36:50 +0200 Subject: [PATCH] correctly hide the picker --- .../javascripts/discourse/components/emoji-picker.js.es6 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 b/app/assets/javascripts/discourse/components/emoji-picker.js.es6 index b043e9e7d84..0b9628bb831 100644 --- a/app/assets/javascripts/discourse/components/emoji-picker.js.es6 +++ b/app/assets/javascripts/discourse/components/emoji-picker.js.es6 @@ -91,7 +91,7 @@ export default Ember.Component.extend({ close() { $picker - .css({width: "", left: "", bottom: ""}) + .css({width: "", left: "", bottom: "", display: "none"}) .empty(); $modal.removeClass("fadeIn"); @@ -343,12 +343,13 @@ export default Ember.Component.extend({ marginLeft: this.site.isMobileDevice ? 5 : -170, marginTop: this.site.isMobileDevice ? 5 : -150, left: this.site.isMobileDevice ? 0 : "50%", - top: this.site.isMobileDevice ? 0 : "50%" + top: this.site.isMobileDevice ? 0 : "50%", + display: "flex" }); } else { $modal.removeClass("fadeIn"); - let cssAttributes = { width: 400, marginLeft: "", marginTop: "", left: "", top: "" }; + let cssAttributes = { width: 400, marginLeft: "", marginTop: "", left: "", top: "", display: "flex"}; if(isLargePreview) { cssAttributes.left = (Ember.$("#reply-control").width() - Ember.$(".d-editor").width() ) / 2 + Ember.$(".d-editor-preview-wrapper").position().left;