提交 66da0fa8 authored 作者: Anthony Minessale II's avatar Anthony Minessale II

Merge pull request #411 in FS/freeswitch from…

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

* commit '070c8999':
  FS-7998 #resolve Simply don't ask.
...@@ -283,6 +283,7 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope', ...@@ -283,6 +283,7 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope',
}); });
$rootScope.$on('page.incall', function(event, data) { $rootScope.$on('page.incall', function(event, data) {
if (storage.data.askRecoverCall) {
prompt({ prompt({
title: 'Oops, Active Call in Course.', title: 'Oops, Active Call in Course.',
message: 'It seems you were in a call before leaving the last time. Wanna go back to that?' message: 'It seems you were in a call before leaving the last time. Wanna go back to that?'
...@@ -294,6 +295,12 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope', ...@@ -294,6 +295,12 @@ vertoControllers.controller('MainController', ['$scope', '$rootScope',
storage.data.userStatus = 'connecting'; storage.data.userStatus = 'connecting';
verto.hangup(); verto.hangup();
}); });
} else {
verto.changeData(storage);
console.log('redirect to incall page');
$location.path('/incall');
}
}); });
$rootScope.callActive = function(data) { $rootScope.callActive = function(data) {
......
...@@ -34,7 +34,8 @@ storageService.service('storage', ['$rootScope', '$localStorage', ...@@ -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) {
......
...@@ -58,6 +58,12 @@ ...@@ -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>
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论