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

FS-8247 [verto_communicator] Waiting for server reconnection.

This commit is contained in:
Stefan Yohansson 2015-10-05 18:02:07 -03:00
parent 38abf36609
commit 6df703fc40
5 changed files with 61 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

@ -109,6 +109,7 @@
<script type="text/javascript" src="src/vertoControllers/controllers/MainController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/MenuController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ModalDialpadController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ModalWsReconnectController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ModalLoginInformationController.js"></script>
<script type="text/javascript" src="src/vertoControllers/controllers/ModalSettingsController.js"></script>

9
html5/verto/verto_communicator/src/partials/ws_reconnect.html Normal file
View File

@ -0,0 +1,9 @@
<div class="modal-header">
<h3 class="modal-title">Waiting for server reconnection.</h3>
</div>
<div class="modal-body">
</div>
<div class="modal-footer">
</div>

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

@ -128,12 +128,16 @@
);
};
$rootScope.openModal = function(templateUrl, controller) {
var modalInstance = $modal.open({
$rootScope.openModal = function(templateUrl, controller, _options) {
var options = {
animation: $scope.animationsEnabled,
templateUrl: templateUrl,
controller: controller,
});
};
angular.extend(options, _options);
var modalInstance = $modal.open(options);
modalInstance.result.then(
function(result) {
@ -149,7 +153,33 @@
jQuery.material.init();
}
);
return modalInstance;
};
$rootScope.$on('ws.close', onWSClose);
$rootScope.$on('ws.login', onWSLogin);
var ws_modalInstance;
function onWSClose(ev, data) {
if(ws_modalInstance) {
return;
};
var options = {
backdrop: 'static',
keyboard: false
};
ws_modalInstance = $scope.openModal('partials/ws_reconnect.html', 'ModalWsReconnectController', options);
};
function onWSLogin(ev, data) {
if(!ws_modalInstance) {
return;
};
ws_modalInstance.close();
ws_modalInstance = null;
};
$scope.showAbout = function() {

15
html5/verto/verto_communicator/src/vertoControllers/controllers/ModalWsReconnectController.js Normal file
View File

@ -0,0 +1,15 @@
(function() {
'use strict';
angular
.module('vertoControllers')
.controller('ModalWsReconnectController', ModalWsReconnectController);
ModalWsReconnectController.$inject = ['$scope', 'storage', 'verto'];
function ModalWsReconnectController($scope, storage, verto) {
console.debug('Executing ModalWsReconnectController');
};
})();

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

@ -449,6 +449,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
var callbacks = {
onWSLogin: function(v, success) {
data.connected = success;
$rootScope.$emit('ws.login', success);
console.debug('Connected to verto server:', success);
if (angular.isFunction(callback)) {
@ -539,6 +540,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
onWSClose: function(v, success) {
console.debug('onWSClose:', success);
$rootScope.$emit('ws.close', success);
},
onEvent: function(v, e) {