fix: address feedback

angular · Feb 28, 2017 · ba31165 · ba31165
1 parent b693766
commit ba31165
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/src/lib/autocomplete/autocomplete-trigger.ts b/src/lib/autocomplete/autocomplete-trigger.ts
@@ -230,7 +230,7 @@ export class MdAutocompleteTrigger implements ControlValueAccessor, OnDestroy {
     this._onTouched();
 
     // Only emit blur event if the new focus is *not* on an element inside the panel.
-    if (relatedTarget && !this._overlayRef.overlayElement.contains(relatedTarget)) {
+    if (!this._overlayRef.overlayElement.contains(relatedTarget)) {
       this._blurStream.next(null);
     }
   }

diff --git a/src/lib/autocomplete/autocomplete.spec.ts b/src/lib/autocomplete/autocomplete.spec.ts
@@ -11,6 +11,7 @@ import {ENTER, DOWN_ARROW, SPACE, UP_ARROW} from '../core/keyboard/keycodes';
 import {MdOption} from '../core/option/option';
 import {ViewportRuler} from '../core/overlay/position/viewport-ruler';
 import {FakeViewportRuler} from '../core/overlay/position/fake-viewport-ruler';
+import {extendObject} from '../core/util/object-extend';
 import {MdAutocomplete} from './autocomplete';
 import {MdInputContainer} from '../input/input-container';
 import {Observable} from 'rxjs/Observable';
@@ -1009,12 +1010,7 @@ class AutocompleteWithoutForms {
  * @param extras Extra properties to be attached to the event object.
  */
 function dispatchEvent(eventName: string, element: HTMLElement, extras?: any): void {
-  let event  = document.createEvent('Event');
-
-  if (extras) {
-    Object.assign(event, extras);
-  }
-
+  let event = extendObject(document.createEvent('Event'), extras);
   event.initEvent(eventName, true, true);
   element.dispatchEvent(event);
 }