From 726e52243429ac6f3935ba2aed7687124ea1cf41 Mon Sep 17 00:00:00 2001 From: Italo Rossi Date: Thu, 28 Dec 2017 17:36:35 -0300 Subject: [PATCH] FS-10858 - [verto_communicator] cancel timeout when done to avoid redirect loop --- .../controllers/LoadingController.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js index 0dfee15801..9aaeb6e20e 100644 --- a/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js +++ b/html5/verto/verto_communicator/src/vertoControllers/controllers/LoadingController.js @@ -6,11 +6,19 @@ .controller('LoadingController', ['$rootScope', '$scope', '$location', '$interval', 'verto', function($rootScope, $scope, $location, $interval, verto) { console.log('Loading controller'); - $interval(function() { - if (verto.data.resCheckEnded) { - $location.path('/preview'); - } + var int_id; + + $scope.stopInterval = function() { + $interval.cancel(int_id); + }; + + int_id = $interval(function() { + if (verto.data.resCheckEnded) { + $scope.stopInterval(); + $location.path('/preview'); + } }, 1000); + } ]); })();