From d29eb05b5f0b3315897bfe233b2b4160b60616c9 Mon Sep 17 00:00:00 2001 From: Igor Zhukov Date: Fri, 30 May 2014 18:43:33 +0400 Subject: [PATCH] Closing emoji menu on message send Closes #294 --- app/js/directives.js | 1 + app/vendor/jquery.emojiarea/jquery.emojiarea.js | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/app/js/directives.js b/app/js/directives.js index 65f1d430..5f5310e2 100644 --- a/app/js/directives.js +++ b/app/js/directives.js @@ -491,6 +491,7 @@ angular.module('myApp.directives', ['myApp.filters']) if (submit) { $(element).trigger('submit'); + $(element).trigger('message_send'); return cancelEvent(e); } } diff --git a/app/vendor/jquery.emojiarea/jquery.emojiarea.js b/app/vendor/jquery.emojiarea/jquery.emojiarea.js index f56c706a..ba0f9b6a 100644 --- a/app/vendor/jquery.emojiarea/jquery.emojiarea.js +++ b/app/vendor/jquery.emojiarea/jquery.emojiarea.js @@ -498,6 +498,11 @@ } }); + /*! MODIFICATION: Following 3 lines were added by Igor Zhukov, in order to hide menu on message submit with keyboard */ + $body.on('message_send', function(e) { + self.hide(); + }); + $body.on('mouseup', function(e) { /*! MODIFICATION START Following code was added by Igor Zhukov, in order to prevent close on click on EmojiMenu scrollbar