IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

correctly hide the picker

Browse Source
This commit is contained in:
Joffrey JAFFEUX 2017-07-19 13:36:50 +02:00
parent 8d91e7d493
commit 4ef52d5e88
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/discourse/components/emoji-picker.js.es6
View File

@ -91,7 +91,7 @@ export default Ember.Component.extend({
close() { close() {
$picker $picker
.css({width: "", left: "", bottom: ""}) .css({width: "", left: "", bottom: "", display: "none"})
.empty(); .empty();
$modal.removeClass("fadeIn"); $modal.removeClass("fadeIn");
@ -343,12 +343,13 @@ export default Ember.Component.extend({
marginLeft: this.site.isMobileDevice ? 5 : -170, marginLeft: this.site.isMobileDevice ? 5 : -170,
marginTop: this.site.isMobileDevice ? 5 : -150, marginTop: this.site.isMobileDevice ? 5 : -150,
left: this.site.isMobileDevice ? 0 : "50%", left: this.site.isMobileDevice ? 0 : "50%",
top: this.site.isMobileDevice ? 0 : "50%" top: this.site.isMobileDevice ? 0 : "50%",
display: "flex"
}); });
} else { } else {
$modal.removeClass("fadeIn"); $modal.removeClass("fadeIn");
let cssAttributes = { width: 400, marginLeft: "", marginTop: "", left: "", top: "" }; let cssAttributes = { width: 400, marginLeft: "", marginTop: "", left: "", top: "", display: "flex"};
if(isLargePreview) { if(isLargePreview) {
cssAttributes.left = (Ember.$("#reply-control").width() - Ember.$(".d-editor").width() ) / 2 + Ember.$(".d-editor-preview-wrapper").position().left; cssAttributes.left = (Ember.$("#reply-control").width() - Ember.$(".d-editor").width() ) / 2 + Ember.$(".d-editor-preview-wrapper").position().left;