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

FS-10858 - [verto_communicator] Waiting for resolution check finish before redirecting to preview screen.

This commit is contained in:
Italo Rossi 2017-12-22 15:51:25 -03:00 committed by Mike Jerris
parent 91cc3c56e0
commit e9e5298151
8 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
html5/verto/verto_communicator/src/index.html
View File

@ -132,6 +132,7 @@
<script type="text/javascript" src="src/vertoControllers/controllers/ModalLoginInformationController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/SettingsController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/PreviewController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/LoadingController.js"></script>
<script type="text/javascript" src="src/vertoDirectives/vertoDirectives.module.js"></script>
<script type="text/javascript" src="src/vertoDirectives/directives/autofocus.js"></script>

3
html5/verto/verto_communicator/src/locales/locale-en.json
View File

@ -156,5 +156,6 @@
"LANGUAGE": "Language:",
"BROWSER_LANGUAGE": "Browser Language",
"FACTORY_RESET_SETTINGS": "Factory Reset Settings",
"AUTOGAIN_CONTROL": "Auto Gain Control"
"AUTOGAIN_CONTROL": "Auto Gain Control",
"WAITING_DEVICES": "Waiting for devices..."
}

3
html5/verto/verto_communicator/src/locales/locale-pt.json
View File

@ -154,5 +154,6 @@
"CHAT_DEAF": "Ligar Áudio",
"CHAT_UNDEAF": "Desligar Áudio",
"FACTORY_RESET_SETTINGS": "Redefinir configurações",
"AUTOGAIN_CONTROL": "Controle de Ganho Automático (AGC)"
"AUTOGAIN_CONTROL": "Controle de Ganho Automático (AGC)",
"WAITING_DEVICES": "Aguardando dispositivos..."
}

10
html5/verto/verto_communicator/src/partials/loading.html Normal file
View File

@ -0,0 +1,10 @@
<div class="centered-block-frame" id="loading">
<div class="col-md-6 centered-block">
<div class="card">
<div class="card-body text-center">
<h2>{{ 'LOADING' | translate}}</h2>
<div>{{ 'WAITING_DEVICES' | translate }}</div>
</div>
</div>
</div>
</div>

5
html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js
View File

@ -94,6 +94,11 @@
templateUrl: 'partials/incall.html',
controller: 'InCallController'
}).
when('/loading', {
title: 'Loading Verto Communicator',
templateUrl: 'partials/loading.html',
controller: 'LoadingController'
}).
when('/preview', {
title: 'Preview Video',
templateUrl: 'partials/preview.html',

14
html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js Normal file
View File

@ -0,0 +1,14 @@
(function() {
'use strict';
angular
.module('vertoControllers')
.controller('LoadingController', ['$rootScope', '$scope', '$location',
function($rootScope, $scope, $location) {
console.log('Loading controller');
$rootScope.$on('res_check_done', function() {
$location.path('/preview');
});
}
]);
})();

2
html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js
View File

@ -98,7 +98,7 @@
}
if (redirect && storage.data.preview) {
$location.path('/preview');
$location.path('/loading');
} else if (redirect) {
$location.path('/dialpad');
}

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

@ -448,6 +448,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
}
});
$rootScope.$emit('res_check_done');
} else {
console.debug('There is no instance of verto.');