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

FS-10858 - [verto_communicator] Removing emit of res_check_done, on slow connections the emit could happen before the listening thus freezing the app on loading

This commit is contained in:
Italo Rossi 2017-12-26 14:40:56 -03:00
parent 91f781d811
commit 452b7d12d0
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js
View File

@ -3,12 +3,14 @@
angular angular
.module('vertoControllers') .module('vertoControllers')
.controller('LoadingController', ['$rootScope', '$scope', '$location', .controller('LoadingController', ['$rootScope', '$scope', '$location', '$interval', 'verto',
function($rootScope, $scope, $location) { function($rootScope, $scope, $location, $interval, verto) {
console.log('Loading controller'); console.log('Loading controller');
$rootScope.$on('res_check_done', function() { $interval(function() {
$location.path('/preview'); if (verto.data.resCheckEnded) {
}); $location.path('/preview');
}
}, 1000);
} }
]); ]);
})(); })();

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

@ -174,7 +174,8 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
login: $cookieStore.get('verto_demo_login') || "1008", login: $cookieStore.get('verto_demo_login') || "1008",
password: $cookieStore.get('verto_demo_passwd') || "1234", password: $cookieStore.get('verto_demo_passwd') || "1234",
hostname: window.location.hostname, hostname: window.location.hostname,
wsURL: ("wss://" + window.location.hostname + ":8082") wsURL: ("wss://" + window.location.hostname + ":8082"),
resCheckEnded: false
}; };
function cleanShareCall(that) { function cleanShareCall(that) {
@ -448,7 +449,7 @@ vertoService.service('verto', ['$rootScope', '$cookieStore', '$location', 'stora
} }
}); });
$rootScope.$emit('res_check_done'); data.resCheckEnded = true;
} else { } else {
console.debug('There is no instance of verto.'); console.debug('There is no instance of verto.');