javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-20 20:33:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

style(imports): add spaces in imports

Browse Source
This commit is contained in:
Adam Bradley
2016-06-22 14:29:27 -05:00
parent 469ae82bbc
commit c7fa9490bf
55 changed files with 443 additions and 504 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/components/checkbox/checkbox.ts
View File

@ -1,9 +1,9 @@
import {Component, Optional, Input, Output, EventEmitter, HostListener, Provider, forwardRef, ViewEncapsulation} from '@angular/core';
import {NG_VALUE_ACCESSOR} from '@angular/common';
import { Component, EventEmitter, forwardRef, HostListener, Input, Optional, Output, Provider, ViewEncapsulation } from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/common';
import {Form} from '../../util/form';
import {Item} from '../item/item';
import {isTrueProperty} from '../../util/util';
import { Form } from '../../util/form';
import { Item } from '../item/item';
import { isTrueProperty } from '../../util/util';
const CHECKBOX_VALUE_ACCESSOR = new Provider(
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => Checkbox), multi: true});
@ -83,7 +83,7 @@ export class Checkbox {
/**
* @output {Checkbox} expression to evaluate when the checkbox value changes
*/
@Output() ionChange: EventEmitter<Checkbox> = new EventEmitter();
@Output() ionChange: EventEmitter<Checkbox> = new EventEmitter<Checkbox>();
constructor(
private _form: Form,

6
src/components/infinite-scroll/infinite-scroll-content.ts
View File

@ -1,7 +1,7 @@
import {Component, Input, ViewEncapsulation} from '@angular/core';
import { Component, Input, ViewEncapsulation } from '@angular/core';
import {Config} from '../../config/config';
import {InfiniteScroll} from './infinite-scroll';
import { Config } from '../../config/config';
import { InfiniteScroll } from './infinite-scroll';
/**

4
src/components/infinite-scroll/infinite-scroll.ts
View File

@ -1,4 +1,4 @@
import {Directive, Input, Output, EventEmitter, Host, NgZone, ElementRef} from '@angular/core';
import { Directive, ElementRef, EventEmitter, Host, Input, NgZone, Output } from '@angular/core';
import {Content} from '../content/content';
@ -137,7 +137,7 @@ export class InfiniteScroll {
* you must call the infinite scroll's `complete()` method when
* your async operation has completed.
*/
@Output() ionInfinite: EventEmitter<InfiniteScroll> = new EventEmitter();
@Output() ionInfinite: EventEmitter<InfiniteScroll> = new EventEmitter<InfiniteScroll>();
constructor(
@Host() private _content: Content,

24
src/components/input/input.ts
View File

@ -1,16 +1,16 @@
import {Component, Optional, ElementRef, ViewChild, ViewEncapsulation} from '@angular/core';
import {NgControl} from '@angular/common';
import { Component, Optional, ElementRef, ViewChild, ViewEncapsulation } from '@angular/core';
import { NgControl } from '@angular/common';
import {Config} from '../../config/config';
import {Content} from '../content/content';
import {Form} from '../../util/form';
import {InputBase} from './input-base';
import {App} from '../app/app';
import {Item} from '../item/item';
import {Label} from '../label/label';
import {NativeInput, NextInput} from './native-input';
import {NavController} from '../nav/nav-controller';
import {Platform} from '../../platform/platform';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { Content } from '../content/content';
import { Form } from '../../util/form';
import { InputBase } from './input-base';
import { Item } from '../item/item';
import { Label } from '../label/label';
import { NativeInput, NextInput } from './native-input';
import { NavController } from '../nav/nav-controller';
import { Platform } from '../../platform/platform';
/**

14
src/components/input/native-input.ts
View File

@ -1,8 +1,8 @@
import {Directive, Attribute, ElementRef, Renderer, Input, Output, EventEmitter, HostListener} from '@angular/core';
import {NgControl} from '@angular/common';
import { Directive, ElementRef, EventEmitter, HostListener, Input, Output, Renderer} from '@angular/core';
import { NgControl} from '@angular/common';
import {Config} from '../../config/config';
import {CSS, hasFocus} from '../../util/dom';
import { Config} from '../../config/config';
import { CSS, hasFocus } from '../../util/dom';
/**
@ -17,8 +17,8 @@ export class NativeInput {
private _blurring: boolean;
private _unrefBlur: Function;
@Output() focusChange: EventEmitter<boolean> = new EventEmitter();
@Output() valueChange: EventEmitter<string> = new EventEmitter();
@Output() focusChange: EventEmitter<boolean> = new EventEmitter<boolean>();
@Output() valueChange: EventEmitter<string> = new EventEmitter<string>();
constructor(
private _elementRef: ElementRef,
@ -207,7 +207,7 @@ function removeClone(focusedInputEle: any, queryCssClass: string) {
selector: '[next-input]'
})
export class NextInput {
@Output() focused: EventEmitter<boolean> = new EventEmitter();
@Output() focused: EventEmitter<boolean> = new EventEmitter<boolean>();
@HostListener('focus')
receivedFocus() {

5
src/components/item/item-reorder.ts
View File

@ -1,5 +1,6 @@
import {Component, ElementRef, Inject, forwardRef} from '@angular/core';
import {Item} from './item';
import { Component, ElementRef, forwardRef, Inject } from '@angular/core';
import { Item } from './item';
/**
* @private

32
src/components/item/item-sliding.ts
View File

@ -1,14 +1,14 @@
import {ChangeDetectionStrategy, Component, ContentChildren, ContentChild, Directive, ElementRef, EventEmitter, HostBinding, Input, Optional, Output, QueryList, Renderer, ViewEncapsulation} from '@angular/core';
import { ChangeDetectionStrategy, Component, ContentChildren, ContentChild, Directive, ElementRef, EventEmitter, HostBinding, Input, Optional, Output, QueryList, Renderer, ViewEncapsulation } from '@angular/core';
import {List} from '../list/list';
import {Item} from './item';
import {isPresent} from '../../util/util';
import {CSS, nativeRaf, nativeTimeout} from '../../util/dom';
import { CSS, nativeRaf, nativeTimeout } from '../../util/dom';
import { Item } from './item';
import { isPresent } from '../../util/util';
import { List } from '../list/list';
const SWIPE_FACTOR = 1.1;
const ELASTIC_FACTOR = 0.55;
export const enum SideFlags {
export const enum ItemSideFlags {
None = 0,
Left = 1 << 0,
Right = 1 << 1,
@ -50,7 +50,7 @@ export class ItemOptions {
/**
* @output {event} Expression to evaluate when the item has been fully swiped.
*/
@Output() ionSwipe: EventEmitter<ItemSliding> = new EventEmitter();
@Output() ionSwipe: EventEmitter<ItemSliding> = new EventEmitter<ItemSliding>();
constructor(private _elementRef: ElementRef, private _renderer: Renderer) {
}
@ -65,11 +65,11 @@ export class ItemOptions {
/**
* @private
*/
getSides(): SideFlags {
getSides(): ItemSideFlags {
if (isPresent(this.side) && this.side === 'left') {
return SideFlags.Left;
return ItemSideFlags.Left;
} else {
return SideFlags.Right;
return ItemSideFlags.Right;
}
}
@ -187,7 +187,7 @@ export class ItemSliding {
private _startX: number = 0;
private _optsWidthRightSide: number = 0;
private _optsWidthLeftSide: number = 0;
private _sides: SideFlags;
private _sides: ItemSideFlags;
private _timer: number = null;
private _leftOptions: ItemOptions;
private _rightOptions: ItemOptions;
@ -225,7 +225,7 @@ export class ItemSliding {
* ```
*
*/
@Output() ionDrag: EventEmitter<number> = new EventEmitter();
@Output() ionDrag: EventEmitter<number> = new EventEmitter<number>();
constructor(@Optional() private _list: List, private _renderer: Renderer, private _elementRef: ElementRef) {
_list.enableSlidingItems(true);
@ -242,7 +242,7 @@ export class ItemSliding {
let sides = 0;
for (var item of itemOptions.toArray()) {
var side = item.getSides();
if (side === SideFlags.Left) {
if (side === ItemSideFlags.Left) {
this._leftOptions = item;
} else {
this._rightOptions = item;
@ -280,9 +280,9 @@ export class ItemSliding {
let openAmount = this._startX - x;
switch (this._sides) {
case SideFlags.Right: openAmount = Math.max(0, openAmount); break;
case SideFlags.Left: openAmount = Math.min(0, openAmount); break;
case SideFlags.Both: break;
case ItemSideFlags.Right: openAmount = Math.max(0, openAmount); break;
case ItemSideFlags.Left: openAmount = Math.min(0, openAmount); break;
case ItemSideFlags.Both: break;
default: return;
}

2
src/components/label/label.ts
View File

@ -1,4 +1,4 @@
import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from '@angular/core';
import { Attribute, Directive, ElementRef, Renderer, Input } from '@angular/core';
/**

2
src/components/list/list.ts
View File

@ -36,7 +36,7 @@ export class List extends Ion {
private _reorderGesture: ItemReorderGesture;
private _lastToIndex: number = -1;
@Output() ionItemReorder: EventEmitter<{ from: number, to: number }> = new EventEmitter();
@Output() ionItemReorder: EventEmitter<{ from: number, to: number }> = new EventEmitter<{ from: number, to: number }>();
constructor(elementRef: ElementRef, private _zone: NgZone, @Optional() private _content: Content) {
super(elementRef);

14
src/components/loading/loading.ts
View File

@ -1,11 +1,11 @@
import {Component, Renderer, ElementRef, HostListener, ViewEncapsulation} from '@angular/core';
import { Component, ElementRef, Renderer, ViewEncapsulation } from '@angular/core';
import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
import {Config} from '../../config/config';
import {isPresent, isUndefined, isDefined} from '../../util/util';
import {NavParams} from '../nav/nav-params';
import {ViewController} from '../nav/view-controller';
import { Animation } from '../../animations/animation';
import { Config } from '../../config/config';
import { isDefined, isPresent, isUndefined } from '../../util/util';
import { NavParams } from '../nav/nav-params';
import { Transition, TransitionOptions } from '../../transitions/transition';
import { ViewController} from '../nav/view-controller';
/**

4
src/components/menu/menu-close.ts
View File

@ -1,6 +1,6 @@
import {Directive, Input, HostListener} from '@angular/core';
import { Directive, HostListener, Input } from '@angular/core';
import {MenuController} from './menu-controller';
import { MenuController } from './menu-controller';
/**

6
src/components/menu/menu-controller.ts
View File

@ -1,6 +1,6 @@
import {Menu} from './menu';
import {MenuType} from './menu-types';
import {Platform} from '../../platform/platform';
import { Menu } from './menu';
import { MenuType } from './menu-types';
import { Platform } from '../../platform/platform';
/**

8
src/components/menu/menu-toggle.ts
View File

@ -1,8 +1,8 @@
import {Directive, ElementRef, Optional, Input, HostListener} from '@angular/core';
import { Directive, ElementRef, Input, HostListener, Optional } from '@angular/core';
import {ViewController} from '../nav/view-controller';
import {Navbar} from '../navbar/navbar';
import {MenuController} from './menu-controller';
import { MenuController } from './menu-controller';
import { Navbar } from '../navbar/navbar';
import { ViewController } from '../nav/view-controller';
/**
* @name MenuToggle

8
src/components/menu/menu-types.ts
View File

@ -1,7 +1,7 @@
import {Animation} from '../../animations/animation';
import {Menu} from './menu';
import {MenuController} from './menu-controller';
import {Platform} from '../../platform/platform';
import { Animation } from '../../animations/animation';
import { Menu } from './menu';
import { MenuController } from './menu-controller';
import { Platform } from '../../platform/platform';
/**

26
src/components/menu/menu.ts
View File

@ -1,14 +1,14 @@
import {Component, forwardRef, Directive, Host, EventEmitter, ElementRef, NgZone, Input, Output, Renderer, ChangeDetectionStrategy, ViewEncapsulation, ViewChild} from '@angular/core';
import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, NgZone, Output, Renderer, ViewChild, ViewEncapsulation } from '@angular/core';
import {Ion} from '../ion';
import {Config} from '../../config/config';
import {Platform} from '../../platform/platform';
import {Keyboard} from '../../util/keyboard';
import {MenuContentGesture, MenuTargetGesture} from './menu-gestures';
import {MenuController} from './menu-controller';
import {MenuType} from './menu-types';
import {isTrueProperty} from '../../util/util';
import {Backdrop} from '../backdrop/backdrop';
import { Backdrop } from '../backdrop/backdrop';
import { Config } from '../../config/config';
import { Ion } from '../ion';
import { isTrueProperty } from '../../util/util';
import { Keyboard } from '../../util/keyboard';
import { MenuContentGesture, MenuTargetGesture } from './menu-gestures';
import { MenuController } from './menu-controller';
import { MenuType } from './menu-types';
import { Platform } from '../../platform/platform';
/**
@ -105,7 +105,7 @@ import {Backdrop} from '../backdrop/backdrop';
* `push` for all modes, and then set the type to `overlay` for the `ios` mode.
*
* ```ts
* import {ionicBootstrap} from 'ionic-angular';
* import { ionicBootstrap } from 'ionic-angular';
*
* ionicBootstrap(MyApp, customProviders, {
* menuType: 'push',
@ -150,8 +150,8 @@ import {Backdrop} from '../backdrop/backdrop';
* when it is called.
*
* ```ts
* import {Component} from '@angular/core';
* import {MenuController} from 'ionic-angular';
* import { Component } from '@angular/core';
* import { MenuController } from 'ionic-angular';
*
* @Component({...})
* export class MyPage {

26
src/components/modal/modal.ts
View File

@ -1,14 +1,14 @@
import {Component, ComponentResolver, HostListener, Renderer, ViewChild, ViewContainerRef} from '@angular/core';
import { Component, ComponentResolver, HostListener, Renderer, ViewChild, ViewContainerRef } from '@angular/core';
import {addSelector} from '../../config/bootstrap';
import {Animation} from '../../animations/animation';
import {isPresent, pascalCaseToDashCase} from '../../util/util';
import {Key} from '../../util/key';
import {NavParams} from '../nav/nav-params';
import {PageTransition} from '../../transitions/page-transition';
import {TransitionOptions} from '../../transitions/transition';
import {ViewController} from '../nav/view-controller';
import {windowDimensions} from '../../util/dom';
import { addSelector } from '../../config/bootstrap';
import { Animation } from '../../animations/animation';
import { isPresent, pascalCaseToDashCase } from '../../util/util';
import { Key } from '../../util/key';
import { NavParams } from '../nav/nav-params';
import { PageTransition } from '../../transitions/page-transition';
import { TransitionOptions } from '../../transitions/transition';
import { ViewController } from '../nav/view-controller';
import { windowDimensions } from '../../util/dom';
/**
@ -37,7 +37,7 @@ import {windowDimensions} from '../../util/dom';
*
* @usage
* ```ts
* import {Page, Modal, NavController, NavParams} from 'ionic-angular';
* import { Page, Modal, NavController, NavParams } from 'ionic-angular';
*
* @Component(...)
* class HomePage {
@ -69,8 +69,8 @@ import {windowDimensions} from '../../util/dom';
* modal.
*
* ```ts
* import {Component} from '@angular/core';
* import {Modal, NavController, ViewController} from 'ionic-angular';
* import { Component } from '@angular/core';
* import { Modal, NavController, ViewController } from 'ionic-angular';
*
* @Component(...)
* class HomePage {

3
src/components/modal/test/modal.spec.ts
View File

@ -1,5 +1,6 @@
import {Component} from '@angular/core';
import {Modal, ModalCmp, NavController, ViewController} from '../../../../src';
import {Modal, NavController, ViewController} from '../../../../src';
import {ModalCmp} from '../../../../src/components/modal/modal';
export function run() {
describe('Modal', () => {

46
src/components/nav/nav-controller.ts
View File

@ -1,17 +1,17 @@
import {ViewContainerRef, ComponentResolver, ComponentFactory, ComponentRef, provide, ReflectiveInjector, ResolvedReflectiveProvider, ElementRef, NgZone, Renderer, EventEmitter} from '@angular/core';
import { ComponentResolver, ElementRef, EventEmitter, NgZone, provide, ReflectiveInjector, Renderer, ViewContainerRef } from '@angular/core';
import {addSelector} from '../../config/bootstrap';
import {App} from '../app/app';
import {Config} from '../../config/config';
import {Ion} from '../ion';
import {isBlank, pascalCaseToDashCase} from '../../util/util';
import {Keyboard} from '../../util/keyboard';
import {MenuController} from '../menu/menu-controller';
import {NavParams} from './nav-params';
import {NavPortal} from './nav-portal';
import {SwipeBackGesture} from './swipe-back';
import {Transition} from '../../transitions/transition';
import {ViewController} from './view-controller';
import { addSelector } from '../../config/bootstrap';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { Ion } from '../ion';
import { isBlank, pascalCaseToDashCase } from '../../util/util';
import { Keyboard } from '../../util/keyboard';
import { MenuController } from '../menu/menu-controller';
import { NavParams } from './nav-params';
import { NavPortal } from './nav-portal';
import { SwipeBackGesture } from './swipe-back';
import { Transition } from '../../transitions/transition';
import { ViewController } from './view-controller';
/**
* @name NavController
@ -76,7 +76,7 @@ import {ViewController} from './view-controller';
* defined in any component type which is pushed/popped from a `NavController`.
*
* ```ts
* import {Component} from '@angular/core';
* import {Component } from '@angular/core';
*
* @Component({
* template: 'Hello World'
@ -278,9 +278,9 @@ export class NavController extends Ion {
*
*
*```ts
* import {NavController} from 'ionic-angular'
* import {Detail} from '../detail/detail'
* import {Info} from '../info/info'
* import {NavController } from 'ionic-angular'
* import {Detail } from '../detail/detail'
* import {Info } from '../info/info'
*
* export class Home {
* constructor(nav: NavController) {
@ -302,8 +302,8 @@ export class NavController extends Ion {
*
*
* ```ts
* import {NavController} from 'ionic-angular'
* import {Detail} from '../detail/detail'
* import {NavController } from 'ionic-angular'
* import {Detail } from '../detail/detail'
*
* export class Home {
* constructor(nav: NavController) {
@ -322,10 +322,10 @@ export class NavController extends Ion {
*
*
* ```ts
* import {NavController} from 'ionic-angular';
* import {Info} from '../info/info';
* import {List} from '../list/list';
* import {Detail} from '../detail/detail';
* import {NavController } from 'ionic-angular';
* import {Info } from '../info/info';
* import {List } from '../list/list';
* import {Detail } from '../detail/detail';
*
* export class Home {
* constructor(nav: NavController) {

3
src/components/nav/nav-params.ts
View File

@ -1,6 +1,3 @@
/**
* @name NavParams
* @description

43
src/components/nav/nav-pop.ts Normal file
View File

@ -0,0 +1,43 @@
import { Directive, Optional } from '@angular/core';
import { NavController } from './nav-controller';
/**
* @name NavPop
* @description
* Directive for declaratively pop the current page off from the navigation stack.
*
* @usage
* ```html
* <ion-content>
* <div block button nav-pop>go back</div>
* </ion-content>
* ```
* This will go back one page in the navigation stack
*
* Similar to {@link /docs/v2/api/components/nav/NavPush/ `NavPush` }
* @demo /docs/v2/demos/navigation/
* @see {@link /docs/v2/components#navigation Navigation Component Docs}
* @see {@link ../NavPush NavPush API Docs}
*/
@Directive({
selector: '[nav-pop]',
host: {
'(click)': 'onClick()',
'role': 'link'
}
})
export class NavPop {
constructor(@Optional() private _nav: NavController) {
if (!_nav) {
console.error('nav-pop must be within a NavController');
}
}
/**
* @private
*/
onClick() {
this._nav && this._nav.pop();
}
}

57
src/components/nav/nav-push.ts
View File

@ -1,6 +1,6 @@
import {Directive, Optional, Input} from '@angular/core';
import {NavController} from './nav-controller';
import {NavRegistry} from './nav-registry';
import { Directive, Input, Optional } from '@angular/core';
import { NavController } from './nav-controller';
/**
* @name NavPush
@ -62,8 +62,7 @@ export class NavPush {
@Input() navParams: any;
constructor(
@Optional() private _nav: NavController,
private registry: NavRegistry
@Optional() private _nav: NavController
) {
if (!_nav) {
console.error('nav-push must be within a NavController');
@ -88,54 +87,6 @@ export class NavPush {
params = this.navParams;
}
if (typeof destination === 'string') {
destination = this.registry.get(destination);
}
this._nav && this._nav.push(destination, params);
}
}
/**
* @name NavPop
* @description
* Directive for declaratively pop the current page off from the navigation stack.
*
* @usage
* ```html
* <ion-content>
* <div block button nav-pop>go back</div>
* </ion-content>
* ```
* This will go back one page in the navigation stack
*
* Similar to {@link /docs/v2/api/components/nav/NavPush/ `NavPush` }
* @demo /docs/v2/demos/navigation/
* @see {@link /docs/v2/components#navigation Navigation Component Docs}
* @see {@link ../NavPush NavPush API Docs}
*/
@Directive({
selector: '[nav-pop]',
host: {
'(click)': 'onClick()',
'role': 'link'
}
})
export class NavPop {
/**
* TODO
* @param {NavController} nav TODO
*/
constructor(@Optional() private _nav: NavController) {
if (!_nav) {
console.error('nav-pop must be within a NavController');
}
}
/**
* @private
*/
onClick() {
this._nav && this._nav.pop();
}
}

26
src/components/nav/nav-registry.ts
View File

@ -1,26 +0,0 @@
import {Type} from '@angular/core';
/**
* @private
* Map of possible pages that can be navigated to using an Ionic NavController
*/
export class NavRegistry {
private _pages: Map<string, Type>;
constructor(pages: Type[] = []) {
var pagePairs = pages.map(page => [page['name'], page]);
this._pages = new Map<string, Type>();
for (var i = 0; i < pagePairs.length; i++) {
var pair = pagePairs[i];
this._pages.set(pair[0], pair[1]);
}
}
get(pageName: any) {
return this._pages.get(pageName);
}
set(page: any) {
this._pages.set(page.name, page);
}
}

16
src/components/nav/nav.ts
View File

@ -1,12 +1,12 @@
import {Component, ElementRef, ViewContainerRef, ComponentResolver, Input, Optional, NgZone, Renderer, ViewChild, ViewEncapsulation, AfterViewInit} from '@angular/core';
import { AfterViewInit, Component, ComponentResolver, ElementRef, Input, Optional, NgZone, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
import {App} from '../app/app';
import {Config} from '../../config/config';
import {Keyboard} from '../../util/keyboard';
import {isTrueProperty} from '../../util/util';
import {NavController} from './nav-controller';
import {NavPortal} from './nav-portal';
import {ViewController} from './view-controller';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { Keyboard } from '../../util/keyboard';
import { isTrueProperty } from '../../util/util';
import { NavController } from './nav-controller';
import { NavPortal } from './nav-portal';
import { ViewController } from './view-controller';
/**
* @name Nav

10
src/components/nav/swipe-back.ts
View File

@ -1,8 +1,8 @@
import {MenuController} from '../menu/menu-controller';
import {NavController} from './nav-controller';
import {SlideEdgeGesture} from '../../gestures/slide-edge-gesture';
import {SlideData} from '../../gestures/slide-gesture';
import {assign} from '../../util/util';
import { assign } from '../../util/util';
import { MenuController } from '../menu/menu-controller';
import { NavController } from './nav-controller';
import { SlideData } from '../../gestures/slide-gesture';
import { SlideEdgeGesture } from '../../gestures/slide-edge-gesture';
export class SwipeBackGesture extends SlideEdgeGesture {

17
src/components/nav/view-controller.ts
View File

@ -1,11 +1,10 @@
import {Output, EventEmitter, Type, TemplateRef, ViewContainerRef, ElementRef, Renderer, ChangeDetectorRef} from '@angular/core';
import { ChangeDetectorRef, EventEmitter, ElementRef, Output, Renderer } from '@angular/core';
import {Header, Footer} from '../toolbar/toolbar';
import {isPresent, merge} from '../../util/util';
import {Navbar} from '../navbar/navbar';
import {NavController, NavOptions} from './nav-controller';
import {NavParams} from './nav-params';
import {Tabs} from '../tabs/tabs';
import { Footer, Header } from '../toolbar/toolbar';
import { isPresent, merge } from '../../util/util';
import { Navbar } from '../navbar/navbar';
import { NavController, NavOptions } from './nav-controller';
import { NavParams } from './nav-params';
/**
@ -14,8 +13,8 @@ import {Tabs} from '../tabs/tabs';
* Access various features and information about the current view.
* @usage
* ```ts
* import {Component} from '@angular/core';
* import {ViewController} from 'ionic-angular';
* import { Component } from '@angular/core';
* import { ViewController } from 'ionic-angular';
*
* @Component({...})
* export class MyPage{

17
src/components/navbar/navbar.ts
View File

@ -1,13 +1,12 @@
import {Component, Directive, Optional, ElementRef, Renderer, forwardRef, Inject, Input} from '@angular/core';
import { Component, Directive, ElementRef, forwardRef, Inject, Input, Optional } from '@angular/core';
import {Ion} from '../ion';
import {Icon} from '../icon/icon';
import {ToolbarBase} from '../toolbar/toolbar';
import {Config} from '../../config/config';
import {App} from '../app/app';
import {isTrueProperty} from '../../util/util';
import {ViewController} from '../nav/view-controller';
import {NavController} from '../nav/nav-controller';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { Ion } from '../ion';
import { isTrueProperty } from '../../util/util';
import { NavController } from '../nav/nav-controller';
import { ToolbarBase } from '../toolbar/toolbar';
import { ViewController } from '../nav/view-controller';
@Directive({

4
src/components/option/option.ts
View File

@ -1,6 +1,6 @@
import {Directive, ElementRef, Input, Output, EventEmitter} from '@angular/core';
import { Directive, ElementRef, EventEmitter, Input, Output } from '@angular/core';
import {isPresent, isTrueProperty} from '../../util/util';
import { isPresent, isTrueProperty } from '../../util/util';
/**
* @name Option

24
src/components/picker/picker.ts
View File

@ -1,15 +1,15 @@
import {Component, ElementRef, Input, Output, EventEmitter, ViewChildren, QueryList, ViewChild, Renderer, HostListener, ViewEncapsulation} from '@angular/core';
import {DomSanitizationService} from '@angular/platform-browser';
import { Component, ElementRef, EventEmitter, Input, HostListener, Output, QueryList, Renderer, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core';
import { DomSanitizationService } from '@angular/platform-browser';
import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
import {Config} from '../../config/config';
import {isPresent, isString, isNumber, clamp} from '../../util/util';
import {Key} from '../../util/key';
import {NavParams} from '../nav/nav-params';
import {ViewController} from '../nav/view-controller';
import {raf, cancelRaf, CSS, pointerCoord} from '../../util/dom';
import {UIEventManager} from '../../util/ui-event-manager';
import { Animation } from '../../animations/animation';
import { cancelRaf, pointerCoord, raf } from '../../util/dom';
import { clamp, isNumber, isPresent, isString } from '../../util/util';
import { Config } from '../../config/config';
import { Key } from '../../util/key';
import { NavParams } from '../nav/nav-params';
import { Transition, TransitionOptions } from '../../transitions/transition';
import { UIEventManager } from '../../util/ui-event-manager';
import { ViewController } from '../nav/view-controller';
/**
@ -29,7 +29,7 @@ export class Picker extends ViewController {
super(PickerDisplayCmp, opts);
this.isOverlay = true;
this.ionChange = new EventEmitter();
this.ionChange = new EventEmitter<any>();
// by default, pickers should not fire lifecycle events of other views
// for example, when an picker enters, the current active view should

22
src/components/popover/popover.ts
View File

@ -1,15 +1,15 @@
import {Component, ComponentResolver, ElementRef, HostListener, Renderer, ViewChild, ViewContainerRef} from '@angular/core';
import { Component, ComponentResolver, ElementRef, HostListener, Renderer, ViewChild, ViewContainerRef } from '@angular/core';
import {addSelector} from '../../config/bootstrap';
import {Animation} from '../../animations/animation';
import {Config} from '../../config/config';
import {CSS, nativeRaf} from '../../util/dom';
import {isPresent, pascalCaseToDashCase} from '../../util/util';
import {Key} from '../../util/key';
import {NavParams} from '../nav/nav-params';
import {PageTransition} from '../../transitions/page-transition';
import {TransitionOptions} from '../../transitions/transition';
import {ViewController} from '../nav/view-controller';
import { addSelector } from '../../config/bootstrap';
import { Animation } from '../../animations/animation';
import { Config } from '../../config/config';
import { CSS, nativeRaf } from '../../util/dom';
import { isPresent, pascalCaseToDashCase } from '../../util/util';
import { Key } from '../../util/key';
import { NavParams } from '../nav/nav-params';
import { PageTransition } from '../../transitions/page-transition';
import { TransitionOptions } from '../../transitions/transition';
import { ViewController } from '../nav/view-controller';
const POPOVER_IOS_BODY_PADDING = 2;
const POPOVER_MD_BODY_PADDING = 12;

11
src/components/radio/radio-button.ts
View File

@ -1,10 +1,9 @@
import {Component, Optional, Input, Output, HostListener, EventEmitter, ViewEncapsulation} from '@angular/core';
import {Component, EventEmitter, HostListener, Input, Optional, Output, ViewEncapsulation } from '@angular/core';
import {Form} from '../../util/form';
import {isTrueProperty, isPresent, isBlank, isCheckedProperty} from '../../util/util';
import {Item} from '../item/item';
import {ListHeader} from '../list/list';
import {RadioGroup} from './radio-group';
import { Form } from '../../util/form';
import { isBlank, isCheckedProperty, isPresent, isTrueProperty } from '../../util/util';
import { Item } from '../item/item';
import { RadioGroup } from './radio-group';
/**

12
src/components/radio/radio-group.ts
View File

@ -1,9 +1,9 @@
import {Directive, ElementRef, Renderer, Optional, Input, Output, Provider, forwardRef, HostListener, ContentChild, EventEmitter} from '@angular/core';
import {NG_VALUE_ACCESSOR} from '@angular/common';
import { ContentChild, Directive, ElementRef, EventEmitter, forwardRef, Input, Output, Provider, Renderer } from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/common';
import {RadioButton} from './radio-button';
import {ListHeader} from '../list/list';
import {isPresent, isCheckedProperty} from '../../util/util';
import { ListHeader } from '../list/list';
import { isCheckedProperty } from '../../util/util';
import { RadioButton } from './radio-button';
const RADIO_VALUE_ACCESSOR = new Provider(
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => RadioGroup), multi: true});
@ -86,7 +86,7 @@ export class RadioGroup {
/**
* @output {any} expression to be evaluated when selection has been changed
*/
@Output() ionChange: EventEmitter<RadioGroup> = new EventEmitter();
@Output() ionChange: EventEmitter<RadioGroup> = new EventEmitter<RadioGroup>();
constructor(
private _renderer: Renderer,

18
src/components/range/range.ts
View File

@ -1,12 +1,12 @@
import {Component, Optional, Input, Output, EventEmitter, ViewChild, ViewChildren, QueryList, Renderer, ElementRef, Provider, Inject, forwardRef, ViewEncapsulation} from '@angular/core';
import {NG_VALUE_ACCESSOR} from '@angular/common';
import { Component, ElementRef, EventEmitter, forwardRef, Input, Inject, Optional, Output, Provider, QueryList, Renderer, ViewChild, ViewChildren, ViewEncapsulation } from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/common';
import {Form} from '../../util/form';
import {isTrueProperty, isNumber, isString, isPresent, clamp} from '../../util/util';
import {Item} from '../item/item';
import {UIEventManager} from '../../util/ui-event-manager';
import {pointerCoord, Coordinates, raf} from '../../util/dom';
import {Debouncer} from '../../util/debouncer';
import { clamp, isNumber, isPresent, isString, isTrueProperty } from '../../util/util';
import { Coordinates, pointerCoord, raf } from '../../util/dom';
import { Debouncer } from '../../util/debouncer';
import { Form } from '../../util/form';
import { Item } from '../item/item';
import { UIEventManager } from '../../util/ui-event-manager';
const RANGE_VALUE_ACCESSOR = new Provider(
@ -320,7 +320,7 @@ export class Range {
/**
* @output {Range} Expression to evaluate when the range value changes.
*/
@Output() ionChange: EventEmitter<Range> = new EventEmitter();
@Output() ionChange: EventEmitter<Range> = new EventEmitter<Range>();
constructor(

6
src/components/refresher/refresher-content.ts
View File

@ -1,7 +1,7 @@
import {Component, Input, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import { Component, Input, ViewEncapsulation } from '@angular/core';
import {Config} from '../../config/config';
import {Refresher} from './refresher';
import { Config } from '../../config/config';
import { Refresher } from './refresher';
/**

6
src/components/refresher/refresher.ts
View File

@ -183,17 +183,17 @@ export class Refresher {
* updated to `refreshing`. From within your refresh handler, you must call the
* `complete()` method when your async operation has completed.
*/
@Output() ionRefresh: EventEmitter<Refresher> = new EventEmitter();
@Output() ionRefresh: EventEmitter<Refresher> = new EventEmitter<Refresher>();
/**
* @output {event} While the user is pulling down the content and exposing the refresher.
*/
@Output() ionPull: EventEmitter<Refresher> = new EventEmitter();
@Output() ionPull: EventEmitter<Refresher> = new EventEmitter<Refresher>();
/**
* @output {event} When the user begins to start pulling down.
*/
@Output() ionStart: EventEmitter<Refresher> = new EventEmitter();
@Output() ionStart: EventEmitter<Refresher> = new EventEmitter<Refresher>();
constructor(@Host() private _content: Content, private _zone: NgZone) {

9
src/components/scroll/scroll.ts
View File

@ -1,11 +1,6 @@
import {Component, ElementRef, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import { Component, ElementRef, ChangeDetectionStrategy, ViewEncapsulation } from '@angular/core';
import {Ion} from '../ion';
import {Gesture} from '../../gestures/gesture';
import {CSS} from '../../util/dom';
import {Animation} from '../../animations/animation';
import * as util from '../../util';
import { Ion } from '../ion';
/**
* @name Scroll

10
src/components/searchbar/searchbar.ts
View File

@ -101,27 +101,27 @@ export class Searchbar {
/**
* @output {event} When the Searchbar input has changed including cleared.
*/
@Output() ionInput: EventEmitter<UIEvent> = new EventEmitter();
@Output() ionInput: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
/**
* @output {event} When the Searchbar input has blurred.
*/
@Output() ionBlur: EventEmitter<UIEvent> = new EventEmitter();
@Output() ionBlur: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
/**
* @output {event} When the Searchbar input has focused.
*/
@Output() ionFocus: EventEmitter<UIEvent> = new EventEmitter();
@Output() ionFocus: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
/**
* @output {event} When the cancel button is clicked.
*/
@Output() ionCancel: EventEmitter<UIEvent> = new EventEmitter();
@Output() ionCancel: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
/**
* @output {event} When the clear input button is clicked.
*/
@Output() ionClear: EventEmitter<UIEvent> = new EventEmitter();
@Output() ionClear: EventEmitter<UIEvent> = new EventEmitter<UIEvent>();
/**
* @private

10
src/components/segment/segment.ts
View File

@ -1,7 +1,7 @@
import {Directive, Component, ElementRef, Renderer, Optional, EventEmitter, Input, Output, HostListener, ContentChildren, QueryList, ViewEncapsulation} from '@angular/core';
import {NgControl} from '@angular/common';
import { Component, ContentChildren, Directive, ElementRef, EventEmitter, HostListener, Input, Output, Optional, QueryList, Renderer, ViewEncapsulation } from '@angular/core';
import { NgControl } from '@angular/common';
import {isTrueProperty, isPresent} from '../../util/util';
import { isPresent, isTrueProperty } from '../../util/util';
/**
@ -66,7 +66,7 @@ export class SegmentButton {
/**
* @output {SegmentButton} expression to evaluate when a segment button has been clicked
*/
@Output() ionSelect: EventEmitter<SegmentButton> = new EventEmitter();
@Output() ionSelect: EventEmitter<SegmentButton> = new EventEmitter<SegmentButton>();
constructor(private _renderer: Renderer, private _elementRef: ElementRef) {}
@ -178,7 +178,7 @@ export class Segment {
/**
* @output {Any} expression to evaluate when a segment button has been changed
*/
@Output() ionChange: EventEmitter<SegmentButton> = new EventEmitter();
@Output() ionChange: EventEmitter<SegmentButton> = new EventEmitter<SegmentButton>();
/**

6
src/components/segment/test/basic/main.html
View File

@ -54,13 +54,13 @@
Map mode: <b>{{myForm.controls.mapStyle.value}}</b> -
<span [ngSwitch]="myForm.controls.mapStyle.value">
<span *ngSwitchWhen="'standard'">
<span *ngSwitchCase="'standard'">
<b>Standard</b>
</span>
<span *ngSwitchWhen="'hybrid'">
<span *ngSwitchCase="'hybrid'">
<b>Hybrid</b>
</span>
<span *ngSwitchWhen="'sat'">
<span *ngSwitchCase="'sat'">
<b>Satellite</b>
</span>
</span>

6
src/components/segment/test/nav/main.html
View File

@ -38,13 +38,13 @@
</ion-row>
<div [ngSwitch]="signInType">
<div *ngSwitchWhen="'existing'">
<div *ngSwitchCase="'existing'">
Signing up as an <b>Existing User</b>.
</div>
<div *ngSwitchWhen="'new'">
<div *ngSwitchCase="'new'">
Signing up as a <b>New User</b>.
</div>
<div *ngSwitchWhen="'test'">
<div *ngSwitchCase="'test'">
Signing up as a <b>Test User</b>.
</div>
</div>

18
src/components/select/select.ts
View File

@ -1,13 +1,13 @@
import {Component, Optional, ElementRef, Renderer, Input, Output, Provider, forwardRef, EventEmitter, HostListener, ContentChildren, QueryList, ViewEncapsulation} from '@angular/core';
import {NG_VALUE_ACCESSOR} from '@angular/common';
import { Component, ContentChildren, ElementRef, EventEmitter, forwardRef, Input, HostListener, Optional, Output, Provider, Renderer, QueryList, ViewEncapsulation } from '@angular/core';
import { NG_VALUE_ACCESSOR } from '@angular/common';
import {Alert} from '../alert/alert';
import {ActionSheet} from '../action-sheet/action-sheet';
import {Form} from '../../util/form';
import {Item} from '../item/item';
import {merge, isTrueProperty, isBlank, isCheckedProperty} from '../../util/util';
import {NavController} from '../nav/nav-controller';
import {Option} from '../option/option';
import { ActionSheet } from '../action-sheet/action-sheet';
import { Alert } from '../alert/alert';
import { Form } from '../../util/form';
import { isBlank, isCheckedProperty, isTrueProperty, merge } from '../../util/util';
import { Item } from '../item/item';
import { NavController } from '../nav/nav-controller';
import { Option } from '../option/option';
const SELECT_VALUE_ACCESSOR = new Provider(
NG_VALUE_ACCESSOR, {useExisting: forwardRef(() => Select), multi: true});

4
src/components/show-hide-when/show-hide-when.ts
View File

@ -1,6 +1,6 @@
import {Directive, Attribute, NgZone} from '@angular/core';
import { Attribute, Directive, NgZone } from '@angular/core';
import {Platform} from '../../platform/platform';
import { Platform } from '../../platform/platform';
/**

21
src/components/slides/slides.ts
View File

@ -1,16 +1,12 @@
import {Directive, Component, ElementRef, Renderer, Host, EventEmitter, Input, Output, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import {NgClass} from '@angular/common';
import { ChangeDetectionStrategy, Component, Directive, ElementRef, EventEmitter, Input, Host, Output, Renderer, ViewEncapsulation } from '@angular/core';
import {Ion} from '../ion';
import {Animation} from '../../animations/animation';
import {Gesture} from '../../gestures/gesture';
import {DragGesture} from '../../gestures/drag-gesture';
import {dom} from '../../util';
import {CSS} from '../../util/dom';
import {debounce, isTrueProperty, isPresent, defaults} from '../../util/util';
import {Swiper} from './swiper-widget';
import {Scroll} from '../scroll/scroll';
import { Animation } from '../../animations/animation';
import { Gesture } from '../../gestures/gesture';
import { CSS } from '../../util/dom';
import { debounce, defaults, isTrueProperty, isPresent } from '../../util/util';
import { dom } from '../../util';
import { Ion } from '../ion';
import { Swiper} from './swiper-widget';
/**
@ -193,7 +189,6 @@ import {Scroll} from '../scroll/scroll';
'</div>' +
'<div [class.hide]="!showPager" class="swiper-pagination"></div>' +
'</div>',
directives: [NgClass],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
})

9
src/components/spinner/spinner.ts
View File

@ -1,8 +1,6 @@
import {Component, Input, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import {NgStyle} from '@angular/common';
import {Config} from '../../config/config';
import { ChangeDetectionStrategy, Component, Input, ViewEncapsulation } from '@angular/core';
import { Config } from '../../config/config';
/**
* @name Spinner
@ -106,7 +104,6 @@ import {Config} from '../../config/config';
'<svg viewBox="0 0 64 64" *ngFor="let i of _l" [ngStyle]="i.style">' +
'<line [attr.y1]="i.y1" [attr.y2]="i.y2" transform="translate(32,32)"></line>' +
'</svg>',
directives: [NgStyle],
host: {
'[class]': '_applied',
'[class.spinner-paused]': 'paused'
@ -201,7 +198,7 @@ export class Spinner {
}
const SPINNERS = {
const SPINNERS: any = {
ios: {
dur: 1000,

20
src/components/tabs/tab-button.ts
View File

@ -1,9 +1,8 @@
import {Component, Directive, ElementRef, Optional, Host, forwardRef, ViewContainerRef, HostListener, EventEmitter, Output, Input, Renderer} from '@angular/core';
import {Tab} from './tab';
import {Ion} from '../ion';
import {Config} from '../../config/config';
import { Directive, ElementRef, EventEmitter, HostListener, Input, Output } from '@angular/core';
import { Config } from '../../config/config';
import { Ion } from '../ion';
import { Tab } from './tab';
/**
* @private
@ -29,23 +28,24 @@ export class TabButton extends Ion {
private hasTitleOnly: boolean;
private hasIconOnly: boolean;
private hasBadge: boolean;
private _layout: string;
private layout: string;
@Input() tab: Tab;
@Output() ionSelect: EventEmitter<Tab> = new EventEmitter();
@Output() ionSelect: EventEmitter<Tab> = new EventEmitter<Tab>();
constructor(config: Config, elementRef: ElementRef) {
super(elementRef);
this.disHover = (config.get('hoverCSS') === false);
this._layout = config.get('tabbarLayout');
this.layout = config.get('tabbarLayout');
}
ngOnInit() {
this.tab.btn = this;
this._layout = this.tab.parent.tabbarLayout || this._layout;
this.layout = this.tab.parent.tabbarLayout || this.layout;
this.hasTitle = !!this.tab.tabTitle;
this.hasIcon = !!this.tab.tabIcon && this._layout !== 'icon-hide';
this.hasIcon = !!this.tab.tabIcon && this.layout !== 'icon-hide';
this.hasTitleOnly = (this.hasTitle && !this.hasIcon);
this.hasIconOnly = (this.hasIcon && !this.hasTitle);
this.hasBadge = !!this.tab.tabBadge;

6
src/components/tabs/tab-highlight.ts
View File

@ -1,7 +1,7 @@
import {Directive, ElementRef} from '@angular/core';
import { Directive, ElementRef } from '@angular/core';
import {rafFrames} from '../../util/dom';
import {Tab} from './tab';
import { rafFrames } from '../../util/dom';
import { Tab } from './tab';
/**
* @private

22
src/components/tabs/tab.ts
View File

@ -1,13 +1,13 @@
import {Component, Inject, forwardRef, ElementRef, NgZone, Renderer, ComponentResolver, ViewContainerRef, ViewChild, Type, ViewEncapsulation, ChangeDetectorRef, EventEmitter, Input, Output} from '@angular/core';
import { ChangeDetectorRef, Component, ComponentResolver, ElementRef, EventEmitter, forwardRef, Input, Inject, NgZone, Output, Renderer, ViewChild, ViewEncapsulation, ViewContainerRef } from '@angular/core';
import {App} from '../app/app';
import {Config} from '../../config/config';
import {isTrueProperty} from '../../util/util';
import {Keyboard} from '../../util/keyboard';
import {NavController, NavOptions} from '../nav/nav-controller';
import {TabButton} from './tab-button';
import {Tabs} from './tabs';
import {ViewController} from '../nav/view-controller';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { isTrueProperty} from '../../util/util';
import { Keyboard} from '../../util/keyboard';
import { NavController, NavOptions} from '../nav/nav-controller';
import { TabButton} from './tab-button';
import { Tabs} from './tabs';
import { ViewController} from '../nav/view-controller';
/**
@ -148,7 +148,7 @@ export class Tab extends NavController {
/**
* @input {Page} Set the root page for this tab.
*/
@Input() root: Type;
@Input() root: any;
/**
* @input {object} Any nav-params to pass to the root page of this tab.
@ -215,7 +215,7 @@ export class Tab extends NavController {
/**
* @output {Tab} Method to call when the current tab is selected
*/
@Output() ionSelect: EventEmitter<Tab> = new EventEmitter();
@Output() ionSelect: EventEmitter<Tab> = new EventEmitter<Tab>();
constructor(
@Inject(forwardRef(() => Tabs)) public parent: Tabs,

28
src/components/tabs/tabs.ts
View File

@ -1,17 +1,17 @@
import {Component, ElementRef, Optional, ViewChild, ViewContainerRef, EventEmitter, Output, Input, Renderer, ViewEncapsulation} from '@angular/core';
import { Component, ElementRef, EventEmitter, Input, Output, Optional, Renderer, ViewChild, ViewContainerRef, ViewEncapsulation } from '@angular/core';
import {App} from '../app/app';
import {Config} from '../../config/config';
import {Content} from '../content/content';
import {Ion} from '../ion';
import {isBlank, isTrueProperty} from '../../util/util';
import {nativeRaf} from '../../util/dom';
import {NavController} from '../nav/nav-controller';
import {Platform} from '../../platform/platform';
import {Tab} from './tab';
import {TabButton} from './tab-button';
import {TabHighlight} from './tab-highlight';
import {ViewController} from '../nav/view-controller';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { Content } from '../content/content';
import { Ion } from '../ion';
import { isBlank, isTrueProperty } from '../../util/util';
import { nativeRaf } from '../../util/dom';
import { NavController } from '../nav/nav-controller';
import { Platform } from '../../platform/platform';
import { Tab } from './tab';
import { TabButton } from './tab-button';
import { TabHighlight } from './tab-highlight';
import { ViewController } from '../nav/view-controller';
/**
@ -199,7 +199,7 @@ export class Tabs extends Ion {
/**
* @input {any} Expression to evaluate when the tab changes.
*/
@Output() ionChange: EventEmitter<Tab> = new EventEmitter();
@Output() ionChange: EventEmitter<Tab> = new EventEmitter<Tab>();
/**
* @private

12
src/components/tap-click/tap-click.ts
View File

@ -1,10 +1,10 @@
import {Injectable, NgZone} from '@angular/core';
import { Injectable, NgZone } from '@angular/core';
import {App} from '../app/app';
import {Config} from '../../config/config';
import {pointerCoord, hasPointerMoved} from '../../util/dom';
import {Activator} from './activator';
import {RippleActivator} from './ripple';
import { Activator } from './activator';
import { App } from '../app/app';
import { Config } from '../../config/config';
import { hasPointerMoved, pointerCoord } from '../../util/dom';
import { RippleActivator } from './ripple';
/**

16
src/components/tap-click/test/tapClick.spec.ts
View File

@ -1,4 +1,4 @@
import * as tapClick from '../../../../src';
import {isActivatable} from '../../../../src';
export function run() {
@ -8,33 +8,33 @@ export function run() {
it('should be activatable on <a> element', () => {
let ele = document.createElement('a');
expect( tapClick.isActivatable(ele) ).toBe(true);
expect( isActivatable(ele) ).toBe(true);
});
it('should be activatable on <button> element', () => {
let ele = document.createElement('button');
expect( tapClick.isActivatable(ele) ).toBe(true);
expect( isActivatable(ele) ).toBe(true);
});
it('should be activatable on <ion-item-sliding> element', () => {
let ele = document.createElement('ion-item-sliding');
expect( tapClick.isActivatable(ele) ).toBe(false);
expect( isActivatable(ele) ).toBe(false);
});
it('should be not activatable on <ion-item> element', () => {
let ele = document.createElement('ion-item');
expect( tapClick.isActivatable(ele) ).toBe(false);
expect( isActivatable(ele) ).toBe(false);
});
it('should be not activatable on <div> element', () => {
let ele = document.createElement('div');
expect( tapClick.isActivatable(ele) ).toBe(false);
expect( isActivatable(ele) ).toBe(false);
});
it('should be activatable with "tappable" attribute', () => {
let ele = document.createElement('div');
ele.setAttribute('tappable', true);
expect( tapClick.isActivatable(ele) ).toBe(true);
ele.setAttribute('tappable', 'true');
expect( isActivatable(ele) ).toBe(true);
});
});

18
src/components/toast/toast.ts
View File

@ -1,14 +1,12 @@
import {AfterViewInit, Component, ElementRef, EventEmitter, Output, Renderer} from '@angular/core';
import { AfterViewInit, Component, ElementRef, Renderer } from '@angular/core';
import {ActionSheet, ActionSheetOptions} from '../action-sheet/action-sheet';
import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
import {Config} from '../../config/config';
import {isPresent} from '../../util/util';
import {NavParams} from '../nav/nav-params';
import {NavController} from '../nav/nav-controller';
import {ViewController} from '../nav/view-controller';
import { Animation } from '../../animations/animation';
import { Config } from '../../config/config';
import { isPresent } from '../../util/util';
import { NavController } from '../nav/nav-controller';
import { NavParams } from '../nav/nav-params';
import { Transition, TransitionOptions } from '../../transitions/transition';
import { ViewController } from '../nav/view-controller';
/**
* @name Toast

16
src/components/toggle/toggle.ts
View File

@ -1,11 +1,11 @@
import {Component, ElementRef, Renderer, Input, Output, EventEmitter, Optional, Provider, forwardRef, ViewEncapsulation} from '@angular/core';
import {ControlValueAccessor, NG_VALUE_ACCESSOR} from '@angular/common';
import { Component, ElementRef, EventEmitter, forwardRef, Input, Optional, Output, Provider, Renderer, ViewEncapsulation } from '@angular/core';
import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/common';
import {Form} from '../../util/form';
import {isTrueProperty} from '../../util/util';
import {Item} from '../item/item';
import {pointerCoord} from '../../util/dom';
import {UIEventManager} from '../../util/ui-event-manager';
import { Form } from '../../util/form';
import { isTrueProperty } from '../../util/util';
import { Item } from '../item/item';
import { pointerCoord } from '../../util/dom';
import { UIEventManager } from '../../util/ui-event-manager';
const TOGGLE_VALUE_ACCESSOR = new Provider(
@ -91,7 +91,7 @@ export class Toggle implements ControlValueAccessor {
/**
* @output {Toggle} expression to evaluate when the toggle value changes
*/
@Output() ionChange: EventEmitter<Toggle> = new EventEmitter();
@Output() ionChange: EventEmitter<Toggle> = new EventEmitter<Toggle>();
constructor(
private _form: Form,

11
src/components/toolbar/toolbar.ts
View File

@ -1,11 +1,8 @@
import {Component, Directive, Host, ElementRef, Optional, forwardRef, Inject, ContentChildren, ContentChild, QueryList, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';
import { ChangeDetectionStrategy, Component, ContentChild, ContentChildren, Directive, ElementRef, forwardRef, Inject, Optional, QueryList, ViewEncapsulation } from '@angular/core';
import {Button} from '../button/button';
import {Config} from '../../config/config';
import {Ion} from '../ion';
import {MenuToggle} from '../menu/menu-toggle';
import {Navbar} from '../navbar/navbar';
import {ViewController} from '../nav/view-controller';
import { Config } from '../../config/config';
import { Ion } from '../ion';
import { ViewController } from '../nav/view-controller';
/**

22
src/components/virtual-scroll/virtual-scroll.ts
View File

@ -1,15 +1,15 @@
import {Directive, ContentChild, ContentChildren, QueryList, IterableDiffers, IterableDiffer, TrackByFn, Input, Optional, Renderer, ElementRef, ChangeDetectorRef, NgZone, DoCheck, AfterContentInit, OnDestroy} from '@angular/core';
import { AfterContentInit, ChangeDetectorRef, ContentChild, ContentChildren, Directive, DoCheck, ElementRef, Input, IterableDiffers, IterableDiffer, NgZone, OnDestroy, Optional, QueryList, Renderer, TrackByFn } from '@angular/core';
import {adjustRendered, calcDimensions, estimateHeight, initReadNodes, processRecords, populateNodeData, updateDimensions, writeToNodes} from './virtual-util';
import {Config} from '../../config/config';
import {Content} from '../content/content';
import {Img} from '../img/img';
import {isBlank, isPresent, isFunction} from '../../util/util';
import {nativeRaf, nativeTimeout, clearNativeTimeout} from '../../util/dom';
import {Platform} from '../../platform/platform';
import {ViewController} from '../nav/view-controller';
import {VirtualCell, VirtualData, VirtualNode} from './virtual-util';
import {VirtualFooter, VirtualHeader, VirtualItem} from './virtual-item';
import { adjustRendered, calcDimensions, estimateHeight, initReadNodes, processRecords, populateNodeData, updateDimensions, writeToNodes } from './virtual-util';
import { clearNativeTimeout, nativeRaf, nativeTimeout } from '../../util/dom';
import { Config } from '../../config/config';
import { Content } from '../content/content';
import { Img } from '../img/img';
import { isBlank, isFunction, isPresent } from '../../util/util';
import { Platform } from '../../platform/platform';
import { ViewController } from '../nav/view-controller';
import { VirtualCell, VirtualData, VirtualNode } from './virtual-util';
import { VirtualFooter, VirtualHeader, VirtualItem } from './virtual-item';
/**

50
src/config/bootstrap.ts
View File

@ -1,23 +1,22 @@
import {bootstrap} from '@angular/platform-browser-dynamic';
import {enableProdMode, provide, PLATFORM_DIRECTIVES, ComponentRef, NgZone} from '@angular/core';
import {HTTP_PROVIDERS} from '@angular/http';
import { bootstrap } from '@angular/platform-browser-dynamic';
import { ComponentRef, enableProdMode, NgZone, PLATFORM_DIRECTIVES, provide } from '@angular/core';
import { HTTP_PROVIDERS } from '@angular/http';
import {App} from '../components/app/app';
import {ClickBlock} from '../util/click-block';
import {Config} from './config';
import {Events} from '../util/events';
import {FeatureDetect} from '../util/feature-detect';
import {Form} from '../util/form';
import {IONIC_DIRECTIVES} from './directives';
import {isPresent} from '../util/util';
import {Keyboard} from '../util/keyboard';
import {MenuController} from '../components/menu/menu-controller';
import {nativeTimeout, closest, nativeRaf} from '../util/dom';
import {NavRegistry} from '../components/nav/nav-registry';
import {Platform} from '../platform/platform';
import {ScrollView} from '../util/scroll-view';
import {TapClick} from '../components/tap-click/tap-click';
import {Translate} from '../translation/translate';
import { App } from '../components/app/app';
import { ClickBlock } from '../util/click-block';
import { closest, nativeTimeout, nativeRaf } from '../util/dom';
import { Config } from './config';
import { Events } from '../util/events';
import { FeatureDetect } from '../util/feature-detect';
import { Form } from '../util/form';
import { IONIC_DIRECTIVES } from './directives';
import { isPresent } from '../util/util';
import { Keyboard } from '../util/keyboard';
import { MenuController } from '../components/menu/menu-controller';
import { Platform } from '../platform/platform';
import { ScrollView } from '../util/scroll-view';
import { TapClick } from '../components/tap-click/tap-click';
import { Translate } from '../translation/translate';
const _reflect: any = Reflect;
@ -31,8 +30,8 @@ const _reflect: any = Reflect;
* @usage
*
* ```ts
* import {ionicBootstrap} from 'ionic-angular';
* import {Component} from '@angular/core';
* import { ionicBootstrap } from 'ionic-angular';
* import { Component } from '@angular/core';
*
* @Component({
* templateUrl: 'build/app.html',
@ -97,11 +96,6 @@ function cssReady(done: Function) {
* @private
*/
export function ionicProviders(customProviders?: Array<any>, config?: any): any[] {
let directives = IONIC_DIRECTIVES;
// add custom providers to Ionic's app
customProviders = isPresent(customProviders) ? customProviders : [];
// create an instance of Config
if (!(config instanceof Config)) {
config = new Config(config);
@ -125,7 +119,6 @@ export function ionicProviders(customProviders?: Array<any>, config?: any): any[
let clickBlock = new ClickBlock();
let events = new Events();
let featureDetect = new FeatureDetect();
let navRegistry = new NavRegistry();
setupDom(window, document, config, platform, clickBlock, featureDetect);
bindEvents(window, document, platform, events);
@ -139,11 +132,10 @@ export function ionicProviders(customProviders?: Array<any>, config?: any): any[
Form,
Keyboard,
MenuController,
provide(NavRegistry, {useValue: navRegistry}),
provide(Platform, {useValue: platform}),
Translate,
TapClick,
provide(PLATFORM_DIRECTIVES, {useValue: [directives], multi: true}),
provide(PLATFORM_DIRECTIVES, {useValue: IONIC_DIRECTIVES, multi: true}),
HTTP_PROVIDERS,
customProviders
];

91
src/config/directives.ts
View File

@ -1,49 +1,50 @@
import {forwardRef, Type} from '@angular/core';
import {CORE_DIRECTIVES, FORM_DIRECTIVES} from '@angular/common';
import { forwardRef } from '@angular/core';
import { CORE_DIRECTIVES, FORM_DIRECTIVES } from '@angular/common';
import {Menu} from '../components/menu/menu';
import {MenuToggle} from '../components/menu/menu-toggle';
import {MenuClose} from '../components/menu/menu-close';
import {Backdrop} from '../components/backdrop/backdrop';
import {Badge} from '../components/badge/badge';
import {Button} from '../components/button/button';
import {Content} from '../components/content/content';
import {Img} from '../components/img/img';
import {Scroll} from '../components/scroll/scroll';
import {InfiniteScroll} from '../components/infinite-scroll/infinite-scroll';
import {InfiniteScrollContent} from '../components/infinite-scroll/infinite-scroll-content';
import {Refresher} from '../components/refresher/refresher';
import {RefresherContent} from '../components/refresher/refresher-content';
import {Slides, Slide, SlideLazy} from '../components/slides/slides';
import {Tabs} from '../components/tabs/tabs';
import {Tab} from '../components/tabs/tab';
import {List, ListHeader} from '../components/list/list';
import {Item, ItemContent} from '../components/item/item';
import {ItemSliding, ItemOptions} from '../components/item/item-sliding';
import {VirtualScroll} from '../components/virtual-scroll/virtual-scroll';
import {VirtualItem, VirtualHeader, VirtualFooter} from '../components/virtual-scroll/virtual-item';
import {Toolbar, Header, Footer} from '../components/toolbar/toolbar';
import {ToolbarItem} from '../components/toolbar/toolbar-item';
import {ToolbarTitle} from '../components/toolbar/toolbar-title';
import {Icon} from '../components/icon/icon';
import {Spinner} from '../components/spinner/spinner';
import {Checkbox} from '../components/checkbox/checkbox';
import {Select} from '../components/select/select';
import {Option} from '../components/option/option';
import {DateTime} from '../components/datetime/datetime';
import {Toggle} from '../components/toggle/toggle';
import {TextInput, TextArea} from '../components/input/input';
import {Label} from '../components/label/label';
import {Segment, SegmentButton} from '../components/segment/segment';
import {RadioButton} from '../components/radio/radio-button';
import {RadioGroup} from '../components/radio/radio-group';
import {Range} from '../components/range/range';
import {Searchbar} from '../components/searchbar/searchbar';
import {Nav} from '../components/nav/nav';
import {NavPush, NavPop} from '../components/nav/nav-push';
import {NavRouter} from '../components/nav/nav-router';
import {NavbarTemplate, Navbar} from '../components/navbar/navbar';
import {ShowWhen, HideWhen} from '../components/show-hide-when/show-hide-when';
import { Menu } from '../components/menu/menu';
import { MenuToggle } from '../components/menu/menu-toggle';
import { MenuClose } from '../components/menu/menu-close';
import { Backdrop } from '../components/backdrop/backdrop';
import { Badge } from '../components/badge/badge';
import { Button } from '../components/button/button';
import { Content } from '../components/content/content';
import { Img } from '../components/img/img';
import { Scroll } from '../components/scroll/scroll';
import { InfiniteScroll } from '../components/infinite-scroll/infinite-scroll';
import { InfiniteScrollContent } from '../components/infinite-scroll/infinite-scroll-content';
import { Refresher } from '../components/refresher/refresher';
import { RefresherContent } from '../components/refresher/refresher-content';
import { Slides, Slide, SlideLazy } from '../components/slides/slides';
import { Tabs } from '../components/tabs/tabs';
import { Tab } from '../components/tabs/tab';
import { List, ListHeader } from '../components/list/list';
import { Item, ItemContent } from '../components/item/item';
import { ItemSliding, ItemOptions } from '../components/item/item-sliding';
import { VirtualScroll } from '../components/virtual-scroll/virtual-scroll';
import { VirtualItem, VirtualHeader, VirtualFooter } from '../components/virtual-scroll/virtual-item';
import { Toolbar, Header, Footer } from '../components/toolbar/toolbar';
import { ToolbarItem } from '../components/toolbar/toolbar-item';
import { ToolbarTitle } from '../components/toolbar/toolbar-title';
import { Icon } from '../components/icon/icon';
import { Spinner } from '../components/spinner/spinner';
import { Checkbox } from '../components/checkbox/checkbox';
import { Select } from '../components/select/select';
import { Option } from '../components/option/option';
import { DateTime } from '../components/datetime/datetime';
import { Toggle } from '../components/toggle/toggle';
import { TextInput, TextArea } from '../components/input/input';
import { Label } from '../components/label/label';
import { Segment, SegmentButton } from '../components/segment/segment';
import { RadioButton } from '../components/radio/radio-button';
import { RadioGroup } from '../components/radio/radio-group';
import { Range } from '../components/range/range';
import { Searchbar } from '../components/searchbar/searchbar';
import { Nav } from '../components/nav/nav';
import { NavPop } from '../components/nav/nav-pop';
import { NavPush } from '../components/nav/nav-push';
import { NavRouter } from '../components/nav/nav-router';
import { NavbarTemplate, Navbar } from '../components/navbar/navbar';
import { ShowWhen, HideWhen } from '../components/show-hide-when/show-hide-when';
/**
* @private