From f428935bad564fee0709a9f54882056643361ee4 Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Fri, 31 Jan 2014 13:06:58 +0400
Subject: [PATCH] merged with master

---
 index.html                                  | 2 +-
 js/services.js                              | 4 ----
 vendor/jquery.emojiarea/jquery.emojiarea.js | 2 +-
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/index.html b/index.html
index b5943c2e..839edd03 100644
--- a/index.html
+++ b/index.html
@@ -34,7 +34,7 @@
   <script type="text/javascript" src="vendor/console-polyfill/console-polyfill.js?1"></script>
   <script type="text/javascript" src="vendor/jquery/jquery.min.js"></script>
   <script type="text/javascript" src="vendor/jquery.nanoscroller/nanoscroller.js"></script>
-  <script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js?1"></script>
+  <script type="text/javascript" src="vendor/jquery.emojiarea/jquery.emojiarea.js?2"></script>
 
   <script type="text/javascript" src="vendor/angular/angular.js?1"></script>
   <script type="text/javascript" src="vendor/angular/angular-route.js?1"></script>
diff --git a/js/services.js b/js/services.js
index af5e7444..3dd4bfe0 100644
--- a/js/services.js
+++ b/js/services.js
@@ -2040,10 +2040,6 @@ angular.module('myApp.services', [])
       notificationsClear();
     };
 
-    // console.log('notify', notification);
-
-    notification.show();
-
     notificationsShown[key] = notification;
   };
 
diff --git a/vendor/jquery.emojiarea/jquery.emojiarea.js b/vendor/jquery.emojiarea/jquery.emojiarea.js
index 5a176bbb..09f6802a 100644
--- a/vendor/jquery.emojiarea/jquery.emojiarea.js
+++ b/vendor/jquery.emojiarea/jquery.emojiarea.js
@@ -287,7 +287,7 @@
 	    }, 0);
 	    if (text.length) {
   	    document.execCommand('insertText', false, text);
-  	    return cancelEvent();
+  	    return cancelEvent(e);
 	    }
 	    return true;
 		}