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

Merge pull request #564 in FS/freeswitch from ~ANDCOFFEECODE/freeswitch:bugfix/FS-8365-vc-does-not-clear-new-chat to master 

* commit '547d5357fa738090bc48db866f27eedc7cd0ee49':
  FS-8365 [verto_communicator] fixed chat counter to increment only when the active pane is not the chat itself.
This commit is contained in:
Ítalo Rossi 2015-10-21 11:56:09 -05:00
parent 116c4aa916 547d5357fa
commit 9fee9bc613
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,8 +39,8 @@
console.log('chat.newMessage', data);
$scope.$apply(function() {
$scope.messages.push(data);
if (data.from != verto.data.name && (!$scope.chatStatus ||
$scope.activePane != 'chat')) {
if (data.from != verto.data.name &&
(!$scope.chatStatus && $scope.activePane != 'chat')) {
++$rootScope.chat_counter;
}
$timeout(function() {