From 4621b3ff89006de2f8ac3fa35a04130e61de5144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joa=CC=83o=20Mesquita?= Date: Wed, 26 Aug 2015 22:08:46 -0300 Subject: [PATCH 1/2] FS-7979: [verto_communicator] Prompt for extension before transferring a conference member. --- .../controllers/ChatController.js | 18 ++++++++++++++---- .../src/vertoService/services/vertoService.js | 2 +- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js index c4203e1b07..0372b805fe 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js @@ -4,9 +4,9 @@ angular .module('vertoControllers') .controller('ChatController', ['$scope', '$rootScope', '$http', - '$location', '$anchorScroll', '$timeout', 'verto', + '$location', '$anchorScroll', '$timeout', 'verto', 'prompt', function($scope, $rootScope, $http, $location, $anchorScroll, $timeout, - verto) { + verto, prompt) { console.debug('Executing ChatController.'); function scrollToChatBottom() { @@ -183,8 +183,18 @@ $scope.confTransfer = function(memberID) { console.log('$scope.confTransfer'); - var exten = '1800'; - verto.data.conf.transfer(memberID, exten); + 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) { + console.log(arguments); + verto.data.conf.transfer(memberID, exten); + } + }); }; } ]); diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 25030f6206..439e0f43e3 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -430,7 +430,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora if (data.liveArray) { console.log('Has data.liveArray.'); $rootScope.$emit('members.clear'); - data.liveArray.destroy(); + // data.liveArray.destroy(); data.liveArray = null; } else { console.log('Doesn\'t found data.liveArray.'); From 1d3e85093093986d8aabc1caa109b63078d82750 Mon Sep 17 00:00:00 2001 From: Italo Rossi Date: Wed, 26 Aug 2015 23:30:00 -0300 Subject: [PATCH 2/2] FS-7979: [verto_communicator] Removing extra console.log and commented line. --- .../src/vertoControllers/controllers/ChatController.js | 3 +-- .../src/vertoService/services/vertoService.js | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js index 0372b805fe..d93ab5091f 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/ChatController.js @@ -191,7 +191,6 @@ value: '', }).then(function(exten) { if (exten) { - console.log(arguments); verto.data.conf.transfer(memberID, exten); } }); @@ -199,4 +198,4 @@ } ]); -})(); \ No newline at end of file +})(); diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 439e0f43e3..e110926dad 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -430,7 +430,6 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora if (data.liveArray) { console.log('Has data.liveArray.'); $rootScope.$emit('members.clear'); - // data.liveArray.destroy(); data.liveArray = null; } else { console.log('Doesn\'t found data.liveArray.');