Update all Angular libs (run update_all.sh).

third_party/pkg/angular/lib/directive/ng_model_select.dart

 part of angular.directive;
 
-typedef dynamic ItemEval(dynamic item, num index);
-
 /**
  * HTML [SELECT] element with angular data-binding if used with
- * [NgModelDirective].
+ * [NgModel].
  *
- * The [NgModelDirective] will receive the currently selected item. The binding
+ * The [NgModel] will receive the currently selected item. The binding
  * is performed on the [OPTION].[value] property. An empty [OPTION].[value] is
  * treated as null.
  *
  * If you the model contains value which does not map to any [OPTION] then a new
  * unknown [OPTION] is inserted into the list. Once the model points to an
  * existing [OPTION] the unknown [OPTION] is removed.
  *
- * Becouse [OPTION].[value] attribute is a string, the model is bound to a
- * string. If there is need to bind to an object then [OptionValueDirective]
+ * Because [OPTION].[value] attribute is a string, the model is bound to a
+ * string. If there is need to bind to an object then [OptionValue]
  * should be used.
  *
  */
-@NgDirective(
-    selector: 'select[ng-model]',
-    visibility: NgDirective.CHILDREN_VISIBILITY)
-class InputSelectDirective implements NgAttachAware {
-  final Expando<OptionValueDirective> expando =
-      new Expando<OptionValueDirective>();
+@Decorator(
+    selector: 'select[ng-model]')
+class InputSelect implements AttachAware {
+  final expando = new Expando<OptionValue>();
   final dom.SelectElement _selectElement;
   final NodeAttrs _attrs;
   final NgModel _model;
   final Scope _scope;
 
   final dom.OptionElement _unknownOption = new dom.OptionElement();
   dom.OptionElement _nullOption;
 
   _SelectMode _mode = new _SelectMode(null, null, null);
   bool _dirty = false;
 
-  InputSelectDirective(dom.Element this._selectElement, this._attrs, this._model,
-                       this._scope) {
+  InputSelect(dom.Element this._selectElement, this._attrs, this._model,
+              this._scope) {
     _unknownOption.value = '?';
-    _unknownOption.text = ''; // Explicit due to dartbug.com/14407
-    _selectElement.querySelectorAll('option').forEach((o) {
-      if (_nullOption == null && o.value == '') {
-        _nullOption = o;
-      }
-    });
+    _nullOption = _selectElement.querySelectorAll('option')
+        .firstWhere((o) => o.value == '', orElse: () => null);
   }
 
   attach() {
     _attrs.observe('multiple', (value) {
       _mode.destroy();
       if (value == null) {
         _model.watchCollection = false;
-        _mode = new _SingleSelectMode(expando, _selectElement, _model, _nullOption, _unknownOption);
+        _mode = new _SingleSelectMode(expando, _selectElement, _model,
+            _nullOption, _unknownOption);
       } else {
         _model.watchCollection = true;
         _mode = new _MultipleSelectionMode(expando, _selectElement, _model);
       }
       _mode.onModelChange(_model.viewValue);
     });
 
     _selectElement.onChange.listen((event) => _mode.onViewChange(event));
     _model.render = (value) {
       // TODO(misko): this hack need to delay the rendering until after domRead
       // because the modelChange reads from the DOM. We should be able to render
       // without DOM changes.
       _scope.rootScope.domRead(() {
         _scope.rootScope.domWrite(() => _mode.onModelChange(value));
       });
     };
   }
 
   /**
    * This method invalidates the current state of the selector and forces a
    * re-rendering of the options using the [Scope.evalAsync].
    */
   dirty() {
     if (!_dirty) {
       _dirty = true;
       // TODO(misko): this hack need to delay the rendering until after domRead
-      // becouse the modelChange reads from the DOM. We should be able to render
+      // because the modelChange reads from the DOM. We should be able to render
       // without DOM changes.
       _scope.rootScope.domRead(() {
         _scope.rootScope.domWrite(() {
           _dirty = false;
           _mode.onModelChange(_model.viewValue);
         });
       });
     }
   }
 }
 
 /**
  * Since the [value] attribute of the [OPTION] can only be a string, Angular
  * provides [ng-value] which allows binding to any expression.
  *
  */
-@NgDirective(
-    selector: 'option')
-class OptionValueDirective implements NgAttachAware,
-    NgDetachAware {
-  final InputSelectDirective _inputSelectDirective;
+@Decorator(selector: 'option', module: NgValue.moduleFactory)
+class OptionValue implements AttachAware,
+    DetachAware {
+  final InputSelect _inputSelectDirective;
   final dom.Element _element;
 
   NgValue _ngValue;
 
-  OptionValueDirective(this._element, this._inputSelectDirective, this._ngValue) {
+  OptionValue(this._element, this._inputSelectDirective, this._ngValue) {
     if (_inputSelectDirective != null) {
       _inputSelectDirective.expando[_element] = this;
     }
   }
 
   attach() {
-    if (_inputSelectDirective != null) {
-      _inputSelectDirective.dirty();
-    }
+    if (_inputSelectDirective != null) _inputSelectDirective.dirty();
   }
 
   detach() {
     if (_inputSelectDirective != null) {
       _inputSelectDirective.dirty();
       _inputSelectDirective.expando[_element] = null;
     }
   }
 
-  get ngValue => _ngValue.readValue(_element);
+  get ngValue => _ngValue.value;
 }
 
 class _SelectMode {
-  final Expando<OptionValueDirective> expando;
+  final Expando<OptionValue> expando;
   final dom.SelectElement select;
   final NgModel model;
 
   _SelectMode(this.expando, this.select, this.model);
 
   onViewChange(event) {}
   onModelChange(value) {}
   destroy() {}
 
   get _options => select.querySelectorAll('option');
   _forEachOption(fn, [quiteOnReturn = false]) {
     for (var i = 0; i < _options.length; i++) {
       var retValue = fn(_options[i], i);
       if (quiteOnReturn && retValue != null) return retValue;
     }
     return null;
   }
 }
 
 class _SingleSelectMode extends _SelectMode {
   final dom.OptionElement _unknownOption;
   final dom.OptionElement _nullOption;
 
   bool _unknownOptionActive = false;
 
-  _SingleSelectMode(Expando<OptionValueDirective> expando,
+  _SingleSelectMode(Expando<OptionValue> expando,
                     dom.SelectElement select,
                     NgModel model,
                     this._nullOption,
-                    this._unknownOption
-                    ): super(expando, select, model) {
+                    this._unknownOption)
+      : super(expando, select, model) {
   }
 
   onViewChange(event) {
     var i = 0;
     model.viewValue = _forEachOption((option, _) {
       if (option.selected) {
-        return option == _nullOption ? null : expando[option].ngValue;
+        if (option == _nullOption) return null;
+        assert(expando[option] != null);
+        return expando[option].ngValue;
       }
       if (option != _unknownOption && option != _nullOption) i++;
     }, true);
   }
 
   onModelChange(value) {
     var found = false;
     _forEachOption((option, i) {
       if (option == _unknownOption) return;
       var selected;
       if (value == null) {
         selected = option == _nullOption;
       } else {
-        OptionValueDirective optionValueDirective = expando[option];
-        selected = optionValueDirective == null ? false : optionValueDirective.ngValue == value;
+        OptionValue optionValueDirective = expando[option];
+        selected = optionValueDirective == null ?
+            false :
+            optionValueDirective.ngValue == value;
       }
       found = found || selected;
       option.selected = selected;
     });
 
     if (!found) {
       if (!_unknownOptionActive) {
         select.insertBefore(_unknownOption, select.firstChild);
         _unknownOption.selected = true;
         _unknownOptionActive = true;
       }
     } else {
       if (_unknownOptionActive) {
         _unknownOption.remove();
         _unknownOptionActive = false;
       }
     }
   }
 }
 
 class _MultipleSelectionMode extends _SelectMode {
-  _MultipleSelectionMode(Expando<OptionValueDirective> expando,
+  _MultipleSelectionMode(Expando<OptionValue> expando,
                          dom.SelectElement select,
                          NgModel model)
       : super(expando, select, model);
 
   onViewChange(event) {
     var selected = [];
 
     _forEachOption((o, i) {
       if (o.selected) selected.add(expando[o].ngValue);
     });
     model.viewValue = selected;
   }
 
   onModelChange(List selectedValues) {
     Function fn = (o, i) => o.selected = null;
 
     if (selectedValues is List) {
       fn = (o, i) {
         var selected = expando[o];
-        if (selected == null) {
-          return false;
-        } else {
-          return o.selected = selectedValues.contains(selected.ngValue);
-        }
+        return selected == null ?
+            false :
+            o.selected = selectedValues.contains(selected.ngValue);
       };
     }
 
     _forEachOption(fn);
   }
 }