From: Jaon EarlWolf <jamonsterr@gmail.com>
Date: Mon, 21 Dec 2015 18:48:53 +0000 (-0300)
Subject: FS-8591 [verto_communicator] - Changed ng-keyup to ng-keydown
X-Git-Tag: v1.6.6~1^2~33^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aede42e8bd4d24fff12314908b58b723ffa96011;p=thirdparty%2Ffreeswitch.git

FS-8591 [verto_communicator] - Changed ng-keyup to ng-keydown
---

diff --git a/html5/verto/verto_communicator/src/partials/chat.html b/html5/verto/verto_communicator/src/partials/chat.html
index c769b70a9f..04ef1963ee 100644
--- a/html5/verto/verto_communicator/src/partials/chat.html
+++ b/html5/verto/verto_communicator/src/partials/chat.html
@@ -188,7 +188,7 @@
     <div class="chat-message-input">
       <form ng-submit="send()" >
         <div class="chat-message-input-group">
-          <textarea ng-model="message" ng-keyup="($event.keyCode == 13 && $event.shiftKey !== true) && send()" required="required" class="form-control input-sm" placeholder="Type your message here..."></textarea>
+          <textarea ng-model="message" ng-keydown="($event.keyCode == 13 && $event.shiftKey !== true) && send($event)" required="required" class="form-control input-sm" placeholder="Type your message here..."></textarea>
           <button class="btn btn-success btn-sm" type="submit">
             Send
             <span class="mdi-navigation-arrow-forward chat-message-input-group-icon-button"></span>
diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
index f04529193a..21ac62d9ce 100644
--- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
+++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
@@ -191,10 +191,11 @@
         $scope.openId = $scope.openId == index ? null : index;
       };
 
-      $scope.send = function() {
+      $scope.send = function(event) {
         // Only conferencing chat is supported for now
         // but still calling method with the conference prefix
         // so we know that explicitly.
+        event.preventDefault();
         verto.sendConferenceChat($scope.message);
         $scope.message = CLEAN_MESSAGE;
       };