refactor(forms): remove scope event communication between controls

Author: matsko

lib/directive/ng_control.dart

@@ -16,7 +16,6 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
   bool _valid;
   bool _submit_valid;
 
-  final Scope _scope;
   final NgControl _parentControl;
   final NgAnimate _animate;
   dom.Element _element;
@@ -25,14 +24,12 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
   final List<NgControl> _controls             = new List<NgControl>();
   final Map<String, List<NgControl>> _controlByName = new Map<String, List<NgControl>>();
 
-  NgControl(Scope this._scope, dom.Element this._element, Injector injector,
+  NgControl(dom.Element this._element, Injector injector,
       NgAnimate this._animate)
       : _parentControl = injector.parent.get(NgControl)
   {
     pristine = true;
     untouched = true;
-
-    _scope.on('submitNgControl').listen((e) => _onSubmit(e.data));
   }
 
   @override
@@ -49,13 +46,15 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
   }
 
   reset() {
-    _scope.broadcast('resetNgModel');
     untouched = true;
+    _controls.forEach((control) {
+      control.reset();
+    });
   }
 
   bool hasError(String key) => errors.containsKey(key);
 
-  _onSubmit(bool valid) {
+  onSubmit(bool valid) {
     if (valid) {
       _submit_valid = true;
       _animate.addClass(element, NG_SUBMIT_VALID_CLASS);
@@ -65,6 +64,9 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
       _animate.addClass(element, NG_SUBMIT_INVALID_CLASS);
       _animate.removeClass(element, NG_SUBMIT_VALID_CLASS);
     }
+    _controls.forEach((control) {
+      control.onSubmit(valid);
+    });
   }
 
   get submitted => _submit_valid != null;
@@ -198,14 +200,13 @@ abstract class NgControl implements NgAttachAware, NgDetachAware {
 }
 
 class NgNullControl implements NgControl {
-  var _name, _dirty, _valid, _invalid, _submit_valid, _pristine, _element;
-  var _touched, _untouched;
-  var _controls, _scope, _parentControl, _controlName, _animate;
+  var _name, _dirty, _valid, _submit_valid, _pristine, _element, _touched;
+  var _controls, _parentControl, _controlName, _animate;
   var errors, _controlByName;
   dom.Element element;
 
   NgNullControl() {}
-  _onSubmit(bool valid) {}
+  onSubmit(bool valid) {}
 
   addControl(control) {}
   removeControl(control) {}

lib/directive/ng_form.dart

@@ -23,6 +23,8 @@ part of angular.directive;
     map: const { 'ng-form': '@name' },
     visibility: NgDirective.CHILDREN_VISIBILITY)
 class NgForm extends NgControl {
+  final Scope _scope;
+
   /**
    * Instantiates a new instance of NgForm. Upon creation, the instance of the
    * class will be bound to the formName property on the scope (where formName
@@ -33,14 +35,14 @@ class NgForm extends NgControl {
    * * [element] - The form DOM element.
    * * [injector] - An instance of Injector.
    */
-  NgForm(Scope scope, dom.Element element, Injector injector,
+  NgForm(this._scope, dom.Element element, Injector injector,
       NgAnimate animate) :
-    super(scope, element, injector, animate) {
+    super(element, injector, animate) {
 
     if (!element.attributes.containsKey('action')) {
       element.onSubmit.listen((event) {
         event.preventDefault();
-        _scope.broadcast('submitNgControl', valid == true);
+        onSubmit(valid == true);
         if (valid == true) {
           reset();
         }
@@ -76,6 +78,8 @@ class NgForm extends NgControl {
 }
 
 class NgNullForm extends NgNullControl implements NgForm {
+  var _scope;
+
   NgNullForm() {}
   operator []=(String key, value) {}
   operator[](name) {}

lib/directive/ng_model.dart

@@ -14,6 +14,7 @@ part of angular.directive;
 class NgModel extends NgControl implements NgAttachAware {
   final NgForm _form;
   final AstParser _parser;
+  final Scope _scope;
 
   BoundGetter getter = ([_]) => null;
   BoundSetter setter = (_, [__]) => null;
@@ -26,9 +27,9 @@ class NgModel extends NgControl implements NgAttachAware {
   bool _watchCollection;
   Function render = (value) => null;
 
-  NgModel(Scope _scope, dom.Element _element, Injector injector,
+  NgModel(this._scope, dom.Element _element, Injector injector,
       NgForm this._form, this._parser, NodeAttrs attrs, NgAnimate animate)
-      : super(_scope, _element, injector, animate)
+      : super(_element, injector, animate)
   {
     _exp = attrs["ng-model"];
     watchCollection = false;
@@ -41,16 +42,15 @@ class NgModel extends NgControl implements NgAttachAware {
 
   attach() {
     watchCollection = false;
-    _scope.on('resetNgModel').listen((e) => reset());
   }
 
   reset() {
     untouched = true;
     modelValue = _lastValue;
   }
 
-  _onSubmit(bool valid) {
-    super._onSubmit(valid);
+  onSubmit(bool valid) {
+    super.onSubmit(valid);
     if (valid) {
       _lastValue = modelValue;
     }