kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-07-13 10:37:42 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #411 in FS/freeswitch from ~JMESQUITA/freeswitch:bugfix/FS-7998-dont-prompt-when-recovering-call to master

Browse Source 
* commit '070c89996e995c996a8972f89a633d5041621df5':
  FS-7998 #resolve Simply don't ask.
This commit is contained in:
Anthony Minessale II 2015-08-20 18:39:33 -05:00
commit 66da0fa8da
3 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
html5/verto/verto_communicator/js/controllers.js
View File

@ -283,17 +283,24 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope',
}); });
$rootScope.$on('page.incall', function(event, data) { $rootScope.$on('page.incall', function(event, data) {
prompt({ if (storage.data.askRecoverCall) {
title: 'Oops, Active Call in Course.', prompt({
message: 'It seems you were in a call before leaving the last time. Wanna go back to that?' title: 'Oops, Active Call in Course.',
}).then(function() { message: 'It seems you were in a call before leaving the last time. Wanna go back to that?'
}).then(function() {
verto.changeData(storage);
console.log('redirect to incall page');
$location.path('/incall');
}, function() {
storage.data.userStatus = 'connecting';
verto.hangup();
});
} else {
verto.changeData(storage); verto.changeData(storage);
console.log('redirect to incall page'); console.log('redirect to incall page');
$location.path('/incall'); $location.path('/incall');
}, function() { }
storage.data.userStatus = 'connecting';
verto.hangup();
});
}); });
$rootScope.callActive = function(data) { $rootScope.callActive = function(data) {

3
html5/verto/verto_communicator/js/storage-service.js
View File

@ -34,7 +34,8 @@ storageService.service('storage', ['$rootScope', '$localStorage',
mirrorInput: '', mirrorInput: '',
outgoingBandwidth: '', outgoingBandwidth: '',
incomingBandwidth: '', incomingBandwidth: '',
vidQual: '' vidQual: '',
askRecoverCall: true
}); });
function changeData(verto_data) { function changeData(verto_data) {

6
html5/verto/verto_communicator/partials/modal_settings.html
View File

@ -58,6 +58,12 @@
Scale Remote Video To Match Camera Resolution Scale Remote Video To Match Camera Resolution
</label> </label>
</div> </div>
<div class="checkbox">
<label>
<input type="checkbox" name="ask_recover_call" ng-value="storage.data.askRecoverCall" ng-model="storage.data.askRecoverCall">
Ask before recovering call
</label>
</div>
</div> </div>