Fixed firefox paste

zhukov · Jan 31, 2014 · 91d9bb6 · 91d9bb6
1 parent e75dc67
commit 91d9bb6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/index.html b/app/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/app/js/services.js b/app/js/services.js
@@ -2040,10 +2040,6 @@ angular.module('myApp.services', [])
       notificationsClear();
     };
 
-    // console.log('notify', notification);
-
-    notification.show();
-
     notificationsShown[key] = notification;
   };
 

diff --git a/app/vendor/jquery.emojiarea/jquery.emojiarea.js b/app/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;
 		}