Reverted issue #135

Author: jrief

client/src/js/ng-django-forms.js

@@ -137,63 +137,53 @@ djng_forms_module.directive('ngModel', function() {
 });
 
 
+// This directive is added automatically by django-angular for widgets of type RadioSelect and
+// CheckboxSelectMultiple. This is necessary to adjust the behavior of a collection of input fields,
+// which forms a group for one `django.forms.Field`.
 djng_forms_module.directive('validateMultipleFields', function() {
 	return {
 		restrict: 'A',
 		require: '^?form',
-		// create child scope for changed method
-		scope: true,
-		compile: function(element, attrs) {
-			angular.forEach(element.find('input'), function(elem) {
-				elem = angular.element(elem)
-				elem.attr('ng-change', 'changed()');
-			});
-			
-			return {
-				
-				post: function(scope, element, attrs, controller) {
-					var formCtrl, subFields, checkboxCtrls = [];
-
-					scope.changed = function() {
-						validate(true)
-					}
-
-					function validate(trigger) {
-						var valid = false;
-						angular.forEach(checkboxCtrls, function(checkbox) {
-							valid = valid || checkbox.$modelValue;
-							if(checkbox.clearRejected) {
-								checkbox.clearRejected();
-							}
-						});
-						
-						formCtrl.$setValidity('required', valid);
-						formCtrl.$setValidity('rejected', true);
-						formCtrl.$message = ''
-						
-						if (trigger && angular.isString(subFields)) {
-							formCtrl[subFields].$dirty = true;
-							formCtrl[subFields].$pristine = false;
-						}
-					}
-
-					if (!controller)
-						return;
-					formCtrl = controller;
-					try {
-						subFields = angular.fromJson(attrs.validateMultipleFields);
-					} catch (SyntaxError) {
-						subFields = attrs.validateMultipleFields;
-					}
-					angular.forEach(element.find('input'), function(elem) {
-						if (subFields.indexOf(elem.name) >= 0) {
-							checkboxCtrls.push(formCtrl[elem.name]);
-						}
-					});
+		link: function(scope, element, attrs, formCtrl) {
+			var subFields, checkboxElems = [];
 
-					validate();
+			function validate(event) {
+				var valid = false;
+				angular.forEach(checkboxElems, function(checkbox) {
+					valid = valid || checkbox.checked;
+				});
+				formCtrl.$setValidity('required', valid);
+				if (event) {
+					formCtrl.$dirty = true;
+					formCtrl.$pristine = false;
+					scope.$apply();
 				}
 			}
+
+			if (!formCtrl)
+				return;
+			try {
+				subFields = angular.fromJson(attrs.validateMultipleFields);
+			} catch (SyntaxError) {
+				if (!angular.isString(attrs.validateMultipleFields))
+					return;
+				subFields = [attrs.validateMultipleFields];
+				formCtrl = formCtrl[subFields];
+			}
+			angular.forEach(element.find('input'), function(elem) {
+				if (subFields.indexOf(elem.name) >= 0) {
+					checkboxElems.push(elem);
+					angular.element(elem).on('change', validate);
+				}
+			});
+
+			// remove "change" event handlers from each input field
+			element.on('$destroy', function() {
+				angular.forEach(element.find('input'), function(elem) {
+					angular.element(elem).off('change');
+				});
+			});
+			validate();
 		}
 	};
 });
@@ -278,7 +268,7 @@ djng_forms_module.factory('djangoForm', function() {
 
 	return {
 		// setErrors takes care of updating prepared placeholder fields for displaying form errors
-		// deteced by an AJAX submission. Returns true if errors have been added to the form.
+		// detected by an AJAX submission. Returns true if errors have been added to the form.
 		setErrors: function(form, errors) {
 			// remove errors from this form, which may have been rejected by an earlier validation
 			form.$message = '';