kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-14 11:06:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #440 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-7979-conference-transfer-doesn-t-prompt to master

Browse Source 
* commit '1d3e85093093986d8aabc1caa109b63078d82750':
  FS-7979: [verto_communicator] Removing extra console.log and commented line.
  FS-7979: [verto_communicator] Prompt for extension before transferring a conference member.
This commit is contained in:
Ítalo Rossi 2015-08-26 21:30:58 -05:00
commit 2fcc72ac43
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,9 +4,9 @@
angular angular
.module('vertoControllers') .module('vertoControllers')
.controller('ChatController', ['$scope', '$rootScope', '$http', .controller('ChatController', ['$scope', '$rootScope', '$http',
'$location', '$anchorScroll', '$timeout', 'verto', '$location', '$anchorScroll', '$timeout', 'verto', 'prompt',
function($scope, $rootScope, $http, $location, $anchorScroll, $timeout, function($scope, $rootScope, $http, $location, $anchorScroll, $timeout,
verto) { verto, prompt) {
console.debug('Executing ChatController.'); console.debug('Executing ChatController.');
function scrollToChatBottom() { function scrollToChatBottom() {
@ -181,8 +181,17 @@
$scope.confTransfer = function(memberID) { $scope.confTransfer = function(memberID) {
console.log('$scope.confTransfer'); console.log('$scope.confTransfer');
var exten = '1800'; prompt({
title: 'Transfer party?',
message: 'To what destination would you like to transfer this call?',
input: true,
label: 'Destination',
value: '',
}).then(function(exten) {
if (exten) {
verto.data.conf.transfer(memberID, exten); verto.data.conf.transfer(memberID, exten);
}
});
}; };
} }
]); ]);

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

@ -440,7 +440,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
if (data.liveArray) { if (data.liveArray) {
console.log('Has data.liveArray.'); console.log('Has data.liveArray.');
$rootScope.$emit('members.clear'); $rootScope.$emit('members.clear');
data.liveArray.destroy();
data.liveArray = null; data.liveArray = null;
} else { } else {
console.log('Doesn\'t found data.liveArray.'); console.log('Doesn\'t found data.liveArray.');