Skip to content
Browse files

Merge branch 'feature/reset-view' into develop

  • Loading branch information...
2 parents de7f00e + 1a73070 commit 8ed8921aa789f7b19d14363fd494dd9aca16406e @mwl mwl committed Sep 11, 2012
Showing with 7 additions and 7 deletions.
  1. +1 −1 sc-web/src/main/webapp/index.html
  2. +6 −6 sc-web/src/main/webapp/js/application.js
View
2 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">
View
12 sc-web/src/main/webapp/js/application.js
@@ -42,22 +42,22 @@ 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()
+ $scope.allergyTree = undefined
+ $("#registrationForm").hide()
+ $("#registrationForm").slideDown("slow")
}
else {
- $("#conceptBrowser").slideUp()
+ $("#registrationForm").hide()
}
})
})

0 comments on commit 8ed8921

Please sign in to comment.
Something went wrong with that request. Please try again.