kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #644 in FS/freeswitch from ~JAONZE/freeswitch:bugfix/FS-8591-chat-window-inserts-spurious-carriage to master 

* commit 'aede42e8bd4d24fff12314908b58b723ffa96011':
  FS-8591 [verto_communicator] - Changed ng-keyup to ng-keydown
This commit is contained in:
Ítalo Rossi 2015-12-22 12:45:45 -06:00
parent 2765893b27 aede42e8bd
commit 1911cd1bb4
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
html5/verto/verto_communicator/src/partials/chat.html
View File

@ -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>

3
html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js
View File

@ -195,10 +195,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;
};