fix(dropdown,rating,typeahead): remove global in order to be usable i…

…n System.js (#1734) * fix(dropdown,rating,typeahead): remove global in order to be useable with systemjs and aot * chore(dropdown,rating,typeahead): replaced MouseEvent by Event
valor-software · Mar 10, 2017 · 4a7719b · 4a7719b
1 parent 27a0229
commit 4a7719b
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 18 deletions.
diff --git a/src/dropdown/dropdown-toggle.directive.ts b/src/dropdown/dropdown-toggle.directive.ts
@@ -4,9 +4,6 @@ import {
 
 import { DropdownDirective } from './dropdown.directive';
 
-/* tslint:disable-next-line */
-const MouseEvent = (global as any).MouseEvent as MouseEvent;
-
 /** Mark element which can toggle dropdown visibility with this directive */
 @Directive({
   selector: '[dropdownToggle]',
@@ -42,7 +39,7 @@ export class DropdownToggleDirective implements OnInit {
   }
 
   @HostListener('click', ['$event'])
-  public toggleDropdown(event:MouseEvent):boolean {
+  public toggleDropdown(event:Event):boolean {
     event.stopPropagation();
 
     if (!this.isDisabled) {

diff --git a/src/dropdown/dropdown.service.ts b/src/dropdown/dropdown.service.ts
@@ -7,11 +7,6 @@ export const DISABLED = 'disabled';
 export const OUTSIDECLICK = 'outsideClick';
 export const NONINPUT = 'nonInput';
 
-/* tslint:disable-next-line */
-const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent;
-/* tslint:disable-next-line */
-const MouseEvent = (global as any).MouseEvent as MouseEvent;
-
 @Injectable()
 export class DropdownService {
   private openScope:DropdownDirective;
@@ -48,7 +43,7 @@ export class DropdownService {
     clearTimeout(this.suspendedEvent);
   }
 
-  protected closeDropdown(event:MouseEvent):void {
+  protected closeDropdown(event:Event):void {
     this.suspendedEvent = setTimeout(() => {
       if (!this.openScope) {
         return;

diff --git a/src/pagination/pager.component.ts b/src/pagination/pager.component.ts
@@ -191,7 +191,7 @@ export class PagerComponent implements ControlValueAccessor, OnInit {
     this.onTouched = fn;
   }
 
-  public selectPage(page: number, event?: MouseEvent): void {
+  public selectPage(page: number, event?: Event): void {
     if (event) {
       event.preventDefault();
     }

diff --git a/src/pagination/pagination.component.ts b/src/pagination/pagination.component.ts
@@ -218,7 +218,7 @@ export class PaginationComponent implements ControlValueAccessor, OnInit {
     this.onTouched = fn;
   }
 
-  public selectPage(page:number, event?:MouseEvent):void {
+  public selectPage(page:number, event?:Event):void {
     if (event) {
       event.preventDefault();
     }

diff --git a/src/rating/rating.component.ts b/src/rating/rating.component.ts
@@ -1,9 +1,6 @@
 import { Component, EventEmitter, HostListener, Input, OnInit, Output, forwardRef } from '@angular/core';
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms';
 
-/* tslint:disable-next-line */
-const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent;
-
 export const RATING_CONTROL_VALUE_ACCESSOR: any = {
   provide: NG_VALUE_ACCESSOR,
   useExisting: forwardRef(() => RatingComponent),

diff --git a/src/typeahead/typeahead.directive.ts b/src/typeahead/typeahead.directive.ts
@@ -15,9 +15,6 @@ import 'rxjs/add/operator/toArray';
 import { TypeaheadMatch } from './typeahead-match.class';
 import { ComponentLoaderFactory, ComponentLoader } from '../component-loader';
 
-/* tslint:disable-next-line */
-const KeyboardEvent = (global as any).KeyboardEvent as KeyboardEvent;
-
 @Directive({selector: '[typeahead]'})
 export class TypeaheadDirective implements OnInit, OnDestroy {
   /** options source, can be Array of strings, objects or an Observable for external matching process */