diff --git a/html5/verto/verto_communicator/src/index.html b/html5/verto/verto_communicator/src/index.html index 16e11f5cee..87879b5ae9 100644 --- a/html5/verto/verto_communicator/src/index.html +++ b/html5/verto/verto_communicator/src/index.html @@ -132,6 +132,7 @@ + diff --git a/html5/verto/verto_communicator/src/locales/locale-en.json b/html5/verto/verto_communicator/src/locales/locale-en.json index f5f778e6d4..8cb3d5ae9a 100644 --- a/html5/verto/verto_communicator/src/locales/locale-en.json +++ b/html5/verto/verto_communicator/src/locales/locale-en.json @@ -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..." } diff --git a/html5/verto/verto_communicator/src/locales/locale-pt.json b/html5/verto/verto_communicator/src/locales/locale-pt.json index 7d3260b5ed..5a64454151 100644 --- a/html5/verto/verto_communicator/src/locales/locale-pt.json +++ b/html5/verto/verto_communicator/src/locales/locale-pt.json @@ -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..." } diff --git a/html5/verto/verto_communicator/src/partials/loading.html b/html5/verto/verto_communicator/src/partials/loading.html new file mode 100644 index 0000000000..943a6cb118 --- /dev/null +++ b/html5/verto/verto_communicator/src/partials/loading.html @@ -0,0 +1,10 @@ +
+
+
+
+

{{ 'LOADING' | translate}}

+
{{ 'WAITING_DEVICES' | translate }}
+
+
+
+
\ No newline at end of file diff --git a/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js b/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js index dc3ce4a181..3fa2f0edaa 100644 --- a/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js +++ b/html5/verto/verto_communicator/src/vertoApp/vertoApp.module.js @@ -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', diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js new file mode 100644 index 0000000000..43ceeae092 --- /dev/null +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js @@ -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'); + }); + } + ]); +})(); diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js index ba305c363c..066b69b33e 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/MainController.js @@ -98,7 +98,7 @@ } if (redirect && storage.data.preview) { - $location.path('/preview'); + $location.path('/loading'); } else if (redirect) { $location.path('/dialpad'); } diff --git a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js index 5f22eacebb..3e083bfe19 100644 --- a/html5/verto/verto_communicator/src/vertoService/services/vertoService.js +++ b/html5/verto/verto_communicator/src/vertoService/services/vertoService.js @@ -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.');