From d72bf0c765308283d1aebd1d7d19b94e5613dcea Mon Sep 17 00:00:00 2001
From: Daniel Camargo <pererinha@gmail.com>
Date: Mon, 16 Dec 2013 13:49:01 -0200
Subject: [PATCH] partial #1914 - if i X out of the password help modal and
 then click Login, I should be taken to the Login modal, not the password help
 modal again

---
 .../default/crunchbutton/frontend/account.phtml     |  2 +-
 www/assets/js/app.js                                |  5 ++---
 www/assets/js/controllers.js                        |  5 +++++
 www/assets/js/directives.js                         | 13 +++++++++++++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/include/views/default/crunchbutton/frontend/account.phtml b/include/views/default/crunchbutton/frontend/account.phtml
index d934a1d5d..662da181f 100644
--- a/include/views/default/crunchbutton/frontend/account.phtml
+++ b/include/views/default/crunchbutton/frontend/account.phtml
@@ -1,5 +1,5 @@
 <div class="account-container modal zoom-anim-dialog small-container mfp-hide">
-	<div ng-controller="AccountModalHeaderCtrl" class="header" ng-show="modal.header">
+	<div ng-controller="AccountModalHeaderCtrl" modal-reset="resetModal()" class="header" ng-show="modal.header">
 		<h1 class="signin {{ modal.signin && 'active' || 'link' }}" ng-click="modal.toggleSignForm( 'signin' )">Log In</h1>
 		<div class="divisor">|</div>
 		<h1 class="signup {{ modal.signup && 'active' || 'link' }}" ng-click="modal.toggleSignForm( 'signup' )">Sign up</h1>
diff --git a/www/assets/js/app.js b/www/assets/js/app.js
index 23b633cfe..df2eddb8a 100644
--- a/www/assets/js/app.js
+++ b/www/assets/js/app.js
@@ -763,11 +763,9 @@ App.dialog = {
 				'<h1>' + arguments[0] + '</h1>' +
 				'<div class="small-container-content">' + arguments[1] + '</div>' +
 				'</div>';
-
 		} else if ($(arguments[0]).length) {
 			// its a dom element
-			var src = $(arguments[0]);
-
+			var src = $( arguments[0] );
 		} else {
 			console.log('ERROR WITH DIALOG');
 			return;
@@ -799,6 +797,7 @@ App.dialog = {
 				close: function() {
 					$('.wrapper').removeClass('dialog-open-effect-a dialog-open-effect-b dialog-open-effect-c dialog-open-effect-d');
 					App.applyIOSPositionFix();
+					App.rootScope.$broadcast( 'modalClosed' );
 				}
 			}
 			//my-mfp-zoom-in
diff --git a/www/assets/js/controllers.js b/www/assets/js/controllers.js
index 60e900120..6c054a937 100644
--- a/www/assets/js/controllers.js
+++ b/www/assets/js/controllers.js
@@ -950,9 +950,14 @@ NGApp.controller( 'AccountModalHeaderCtrl', function ( $scope, $http, AccountMod
 	$scope.modal = AccountModalService;
 	$scope.account = AccountService;
 	$scope.help = AccountHelpService;
+	$scope.resetModal = function(){
+		$scope.modal.toggleSignForm( 'signin' );
+		$scope.help.show( false );
+	}
 });
 
 
+
 NGApp.controller( 'AccountFacebookCtrl', function ( $scope, $http, AccountModalService, AccountService, AccountHelpService ) {
 	$scope.modal = AccountModalService;
 });
diff --git a/www/assets/js/directives.js b/www/assets/js/directives.js
index 04d511fc3..f2ea604a3 100644
--- a/www/assets/js/directives.js
+++ b/www/assets/js/directives.js
@@ -346,6 +346,19 @@ NGApp.directive('ngToggle', function() {
 	};
 });
 
+NGApp.directive( 'modalReset', function( $rootScope ) {
+	return {
+		restrict: 'A',
+		link: function( scope, element, attrs ){	
+			scope.$on( 'modalClosed', function( e, data ) {
+				if( attrs.modalReset ){
+					scope.$eval( attrs.modalReset );	
+				}
+			} );
+		}
+	}
+} );
+
 NGApp.directive( 'geoComplete', function() {
 	return {
 		restrict: 'A',