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

Merge pull request #455 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-7840-chat-messages-forwarded-to-all-conference to master 

* commit '0a2eafa306b25d80b341f63e9d5288ee2fd72ebf':
  FS-7840 [verto_communicator] Use chatChannel to send and receive messages from conferences.
This commit is contained in:
Brian West 2015-08-28 16:59:27 -05:00
parent 288c62576f 0a2eafa306
commit 230e636332
2 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -132,9 +132,11 @@
* Public methods.
*/
$scope.send = function() {
verto.sendMessage($scope.message, function() {
$scope.message = CLEAN_MESSAGE;
});
// Only conferencing chat is supported for now
// but still calling method with the conference prefix
// so we know that explicitly.
verto.sendConferenceChat($scope.message);
$scope.message = CLEAN_MESSAGE;
};
// Participants moderation.

23
html5/verto/verto_communicator/src/vertoService/services/vertoService.js
View File

@ -335,6 +335,14 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
dialog: dialog,
hasVid: storage.data.useVideo,
laData: pvtData,
chatCallback: function(v, e) {
var from = e.data.fromDisplay || e.data.from || "Unknown";
var message = e.data.message || "";
$rootScope.$emit('chat.newMessage', {
from: from,
body: message
});
},
onBroadcast: function(v, conf, message) {
console.log('>>> conf.onBroadcast:', arguments);
if (message.action == 'response') {
@ -441,6 +449,10 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}
}
break;
/**
* This is not being used for conferencing chat
* anymore (see conf.chatCallback for that).
*/
case $.verto.enum.message.info:
var body = params.body;
var from = params.from_msg_name || params.from;
@ -750,7 +762,16 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
callback(data.instance, true);
}
},
/*
* Method is used to send conference chats ONLY.
*/
sendConferenceChat: function(message) {
data.conf.sendChat(message, "message");
},
/*
* Method is used to send user2user chats.
* VC does not yet support that.
*/
sendMessage: function(body, callback) {
data.call.message({
to: data.chattingWith,