continued work on Issue #43 - added ngAnimate as dependency, experime…

…nted with using close() and dismiss() methods from modals documentation. Still cannot resolve issue.
docsmage · Jul 7, 2016 · c26bc4f · c26bc4f
1 parent 65271dc
commit c26bc4f
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 14 deletions.
diff --git a/app/pages/index.html b/app/pages/index.html
@@ -77,6 +77,8 @@
 	<script src="https://cdn.firebase.com/js/client/2.2.4/firebase.js"></script>
 	<!-- AngularFire -->
 	<script src="https://cdn.firebase.com/libs/angularfire/1.1.3/angularfire.min.js"></script>
+<!--	Angular Animate-->
+	<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-animate.js"></script>
 
 </head>
 <body id="background" class="container">

diff --git a/app/scripts/app.js b/app/scripts/app.js
@@ -1,4 +1,4 @@
-var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap", "ngCookies"])
+var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap", "ngCookies", "ngAnimate"])
 
 // config states & controllers
 .config(function($stateProvider, $locationProvider, $urlRouterProvider) {
@@ -51,13 +51,14 @@ var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap
 		url: '/profile',
 		controller: 'ProfileCtrl',
 		templateUrl: '/templates/profile.html'
-	});		
-	
-	relaxIO.run(['Auth', 'UserRestService', function run(Auth, UserRestService) {
+	});
+
+	relaxIO.run(['Auth', 'UserRestService', '$uibModalStack', function run(Auth, UserRestService, $uibModalStack) {
 
 		var _user = UserRestService.requestCurrentUser();
 		Auth.set(_user);
+		$uibModalStack.dismissAll();
 
-	}])
+	}]);	
 
 });
diff --git a/app/scripts/controllers/NavCtrl.js b/app/scripts/controllers/NavCtrl.js
@@ -5,17 +5,19 @@ relaxIO.controller('NavCtrl', ['$scope', 'SaveMix', 'LogOut', 'Session', 'SoundS
 	$scope.openSaveMix = function () {
 		modalInstance = $uibModal.open({
 			templateUrl: 'templates/savemixpopup.html',
+			animate: false,
 		});
 	};
 
 	$scope.openSignUp = function () {
 		modalInstance = $uibModal.open({
 			templateUrl: 'templates/signuppopup.html',
+			animate: false,
 		});
 	};
 
 	$scope.closeModal = function () {
-		modalInstance.close();
+		modalInstance.dismiss();
 	};
 
 
@@ -30,7 +32,7 @@ relaxIO.controller('NavCtrl', ['$scope', 'SaveMix', 'LogOut', 'Session', 'SoundS
 	$scope.saveMix = function () {
 		var name = $scope.name;
 		SaveMix.saveMix(name);
-		modalInstance.closeModal();
+		$scope.closeModal(modalInstance);
 
 	};
 

diff --git a/dist/index.html b/dist/index.html
@@ -77,6 +77,8 @@
 	<script src="https://cdn.firebase.com/js/client/2.2.4/firebase.js"></script>
 	<!-- AngularFire -->
 	<script src="https://cdn.firebase.com/libs/angularfire/1.1.3/angularfire.min.js"></script>
+<!--	Angular Animate-->
+	<script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.5.7/angular-animate.js"></script>
 
 </head>
 <body id="background" class="container">

diff --git a/dist/scripts/app.js b/dist/scripts/app.js
@@ -1,4 +1,4 @@
-var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap", "ngCookies"])
+var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap", "ngCookies", "ngAnimate"])
 
 // config states & controllers
 .config(function($stateProvider, $locationProvider, $urlRouterProvider) {
@@ -51,13 +51,14 @@ var relaxIO = angular.module("relaxIO", ["ui.router", "firebase",  "ui.bootstrap
 		url: '/profile',
 		controller: 'ProfileCtrl',
 		templateUrl: '/templates/profile.html'
-	});		
-	
-	relaxIO.run(['Auth', 'UserRestService', function run(Auth, UserRestService) {
+	});
+
+	relaxIO.run(['Auth', 'UserRestService', '$uibModalStack', function run(Auth, UserRestService, $uibModalStack) {
 
 		var _user = UserRestService.requestCurrentUser();
 		Auth.set(_user);
+		$uibModalStack.dismissAll();
 
-	}])
+	}]);	
 
 });
diff --git a/dist/scripts/controllers/NavCtrl.js b/dist/scripts/controllers/NavCtrl.js
@@ -5,17 +5,19 @@ relaxIO.controller('NavCtrl', ['$scope', 'SaveMix', 'LogOut', 'Session', 'SoundS
 	$scope.openSaveMix = function () {
 		modalInstance = $uibModal.open({
 			templateUrl: 'templates/savemixpopup.html',
+			animate: false,
 		});
 	};
 
 	$scope.openSignUp = function () {
 		modalInstance = $uibModal.open({
 			templateUrl: 'templates/signuppopup.html',
+			animate: false,
 		});
 	};
 
 	$scope.closeModal = function () {
-		modalInstance.close();
+		modalInstance.dismiss();
 	};
 
 
@@ -30,7 +32,7 @@ relaxIO.controller('NavCtrl', ['$scope', 'SaveMix', 'LogOut', 'Session', 'SoundS
 	$scope.saveMix = function () {
 		var name = $scope.name;
 		SaveMix.saveMix(name);
-		modalInstance.closeModal();
+		$scope.closeModal(modalInstance);
 
 	};