提交 1911cd1b authored 作者: Ítalo Rossi's avatar Ítalo Rossi

Merge pull request #644 in FS/freeswitch from…

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

* commit 'aede42e8':
  FS-8591 [verto_communicator] - Changed ng-keyup to ng-keydown
...@@ -188,7 +188,7 @@ ...@@ -188,7 +188,7 @@
<div class="chat-message-input"> <div class="chat-message-input">
<form ng-submit="send()" > <form ng-submit="send()" >
<div class="chat-message-input-group"> <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"> <button class="btn btn-success btn-sm" type="submit">
Send Send
<span class="mdi-navigation-arrow-forward chat-message-input-group-icon-button"></span> <span class="mdi-navigation-arrow-forward chat-message-input-group-icon-button"></span>
......
...@@ -195,10 +195,11 @@ ...@@ -195,10 +195,11 @@
$scope.openId = $scope.openId == index ? null : index; $scope.openId = $scope.openId == index ? null : index;
}; };
$scope.send = function() { $scope.send = function(event) {
// Only conferencing chat is supported for now // Only conferencing chat is supported for now
// but still calling method with the conference prefix // but still calling method with the conference prefix
// so we know that explicitly. // so we know that explicitly.
event.preventDefault();
verto.sendConferenceChat($scope.message); verto.sendConferenceChat($scope.message);
$scope.message = CLEAN_MESSAGE; $scope.message = CLEAN_MESSAGE;
}; };
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论