Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: broken specs

This commit is contained in:
Joffrey JAFFEUX 2017-07-20 20:07:44 +02:00
parent e7c170bb00
commit ac6413f456
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,7 @@ export default Ember.Component.extend({
this.$(".emoji-picker-modal")
.on("click", () => this.set("active", false));
Ember.$(document).on("click", (event) => {
this.$(document).on("click.emoji-picker", (event) => {
if(event.target.className.indexOf("grippie") === -1) {
this.set("active", false);
return false;
@ -159,7 +159,7 @@ export default Ember.Component.extend({
this.$(window).off("resize");
this.$(".emoji-picker-modal").off("click");
Ember.$("#reply-control").off("div-resizing");
Ember.$(document).off("click");
this.$(document).off("click.emoji-picker");
},
_filterEmojisList() {
@ -443,7 +443,7 @@ export default Ember.Component.extend({
desktopModalePositioning();
} else {
let previewInputOffset = Ember.$(".d-editor-input").offset();
let replyControlOffset = Ember.$("#reply-control").offset();
let replyControlOffset = Ember.$("#reply-control").offset() || {left: 0};
let left = previewInputOffset.left - replyControlOffset.left;
desktopPositioning({left, bottom: Ember.$("#reply-control").height() - 48});
}