diff public/javascripts/ssamr_institutions.js @ 1337:077b8890835a cannam

Merge from live branch

--- a/public/javascripts/ssamr_institutions.js	Fri Jun 14 11:30:07 2013 +0100
+++ b/public/javascripts/ssamr_institutions.js	Thu Jun 20 13:14:02 2013 +0100
@@ -3,27 +3,26 @@
 /* SSAMR specific functions */
 
 /* institution related functions */
-Event.observe(window, 'load',
-  function() {
-	$('ssamr_user_details_institution_type_true').observe('click', function(e, el) {
-	    $('ssamr_user_details_other_institution').disable();
-		$('ssamr_user_details_institution_id').enable();
+$(document).ready(function(){
+	$('#ssamr_user_details_institution_type_true').click(function() {
+        $('#ssamr_user_details_other_institution').attr('disabled', 'disabled');
+        $('#ssamr_user_details_institution_id').removeAttr('disabled');
 	});
 
-	$('ssamr_user_details_institution_type_false').observe('click', function(e, el) {
-	    $('ssamr_user_details_other_institution').enable();
-		$('ssamr_user_details_institution_id').disable();
+	$('#ssamr_user_details_institution_type_false').click(function() {
+        $('#ssamr_user_details_other_institution').removeAttr('disabled');
+        $('#ssamr_user_details_institution_id').attr('disabled', 'disabled');
 	});
-        
-    if($('ssamr_user_details_institution_type_true').checked)
-        $('ssamr_user_details_other_institution').disable();
+
+    if($('#ssamr_user_details_institution_type_true').checked)
+        $('#ssamr_user_details_other_institution').attr('disabled', 'disabled');
     else if($('ssamr_user_details_institution_type_false').checked)
-        $('ssamr_user_details_institution_id').disable();
+        $('#ssamr_user_details_institution_id').attr('disabled', 'disabled');
 	else {
-		$('ssamr_user_details_other_institution').disable();
-	  	$('ssamr_user_details_institution_id').enable();
-	  	$('ssamr_user_details_institution_type_true').checked = true;
-	  	$('ssamr_user_details_institution_type_false').checked = false;
+		$('#ssamr_user_details_other_institution').attr('disabled', 'disabled');
+        $('#ssamr_user_details_institution_id').removeAttr('disabled');
+        $('#ssamr_user_details_institution_type_true').checked = true;
+        $('#ssamr_user_details_institution_type_false').checked = false;
 	}
 }
 );