Merge branch 'master' into 'develop'

Master(efernandez) See merge request !114

Merge branch 'master' into 'develop'
Master(efernandez) See merge request !114
Eric Fernandez
2 parents 1a682bf13d 9e67c347e1
Showing 1 changed file Show diff stats
src/js/controller.js
@@ -3,7 +3,8 @@ angular.module(&#39;appWrapperDemo&#39;)
         '$scope',
         '$rootScope',
         '$timeout',
-        function($scope, $rootScope, $timeout) {
+        '$uibModalStack',
+        function($scope, $rootScope, $timeout, $uibModalStack) {
             $scope.usarTeclado = false;
             $rootScope.$broadcast('usarTeclado', false);
             $scope.mostrarTeclado = false;
@@ -37,5 +38,10 @@ angular.module(&#39;appWrapperDemo&#39;)
                     }
                 }, 150);
             });
+
+            // Close all modals
+            $rootScope.$on('$locationChangeSuccess', function() {
+                $uibModalStack.dismissAll('close');
+            });
         }
     ]);
...	...	@@ -3,7 +3,8 @@ angular.module('appWrapperDemo')
3	3	'$scope',
4	4	'$rootScope',
5	5	'$timeout',
6		- function($scope, $rootScope, $timeout) {
	6	+ '$uibModalStack',
	7	+ function($scope, $rootScope, $timeout, $uibModalStack) {
7	8	$scope.usarTeclado = false;
8	9	$rootScope.$broadcast('usarTeclado', false);
9	10	$scope.mostrarTeclado = false;
...	...	@@ -37,5 +38,10 @@ angular.module('appWrapperDemo')
37	38	}
38	39	}, 150);
39	40	});
	41	+
	42	+ // Close all modals
	43	+ $rootScope.$on('$locationChangeSuccess', function() {
	44	+ $uibModalStack.dismissAll('close');
	45	+ });
40	46	}
41	47	]);