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

correct positioning when emoji is added

Browse Source
This commit is contained in:
Sam
2014-12-08 14:22:54 +11:00
parent 555b783864
commit 23163422e6
3 changed files with 24 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/emoji/assets/javascripts/emoji-toolbar.js
View File

@@ -33,7 +33,6 @@ var renderPage = Handlebars.compile(
var closeSelector = function(){
$('.emoji-modal, .emoji-modal-wrapper').remove();
$('body, textarea').off('keydown.emoji');
$('#wmd-input').focus();
};
var showSelector = function(){
@@ -61,8 +60,9 @@ var showSelector = function(){
var composerController = Discourse.__container__.lookup('controller:composer');
$('.emoji-page a').click(function(){
composerController.appendText(":" + $(this).attr('title') + ":", {space: true});
composerController.appendTextAtCursor(":" + $(this).attr('title') + ":", {space: true});
closeSelector();
return false;
});
$('body, textarea').on('keydown.emoji', function(e){