Fixed animations on registrationForm

trifork · Sep 11, 2012 · 92224c5 · 92224c5
1 parent de7f00e
commit 92224c5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/sc-web/src/main/webapp/index.html b/sc-web/src/main/webapp/index.html
@@ -78,7 +78,7 @@
         </div>
     </div>
     <hr/>
-    <div class="well" ng-show="selectedRegistration">
+    <div id="registrationForm" class="well">
         <button class="close" type="button" ng-click="hideRegistration()">x</button>
         <div class="row-fluid" cave-registration="selectedRegistration">
             <div class="span8">

diff --git a/sc-web/src/main/webapp/js/application.js b/sc-web/src/main/webapp/js/application.js
@@ -42,22 +42,21 @@ module.controller("IdentityCtrl", function($scope, $location, $log, $http) {
     $scope.$watch("identity", function(newValue, oldValue) {
         $scope.selectedRegistration = undefined
         if (newValue) {
-            $("#identity").slideUp()
+            $("#identity").hide()
             $("#identity").slideDown()
         }
         else {
-            $("#identity").slideUp()
+            $("#identity").hide()
         }
     })
     $scope.$watch("selectedRegistration", function(newValue, oldValue) {
         if (newValue) {
-            $("#conceptBrowser").hide()
-            $scope.selectedRegistration = newValue
-            $("#conceptBrowser").slideDown()
+            $("#registrationForm").hide()
+            $("#registrationForm").slideDown("slow")
 
         }
         else {
-            $("#conceptBrowser").slideUp()
+            $("#registrationForm").hide()
         }
     })
 })