Skip to content

Commit

Permalink
chore(angular): update to angular 2.0.0-rc.1
Browse files Browse the repository at this point in the history
  • Loading branch information
adamdbradley committed May 5, 2016
1 parent 62b97ce commit 4b36c34
Show file tree
Hide file tree
Showing 129 changed files with 280 additions and 351 deletions.
2 changes: 1 addition & 1 deletion demos/events/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<ion-item *ngIf="loggedIn">
Welcome, Administrator!
</ion-item>
<button ion-item menuClose *ngFor="#p of pages" (click)="openPage(menu, p)" [hidden]="(loggedIn == true && p.showLoggedIn == false) || (loggedIn == false && p.showLoggedIn == true)">
<button ion-item menuClose *ngFor="let p of pages" (click)="openPage(menu, p)" [hidden]="(loggedIn == true && p.showLoggedIn == false) || (loggedIn == false && p.showLoggedIn == true)">
<ion-label primary>{{p.title}}</ion-label>
</button>

Expand Down
2 changes: 1 addition & 1 deletion demos/infinite-scroll/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {App, InfiniteScroll} from 'ionic-angular';
import {Injectable} from 'angular2/core';
import {Injectable} from '@angular/core';

/**
* Mock Data Access Object
Expand Down
2 changes: 1 addition & 1 deletion demos/infinite-scroll/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ion-content>

<ion-list>
<ion-item *ngFor="#item of items">
<ion-item *ngFor="let item of items">
{{ item }}
</ion-item>
</ion-list>
Expand Down
2 changes: 1 addition & 1 deletion demos/local-storage/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {App, Page, IonicApp, Config, Platform} from 'ionic-angular';
import {Storage, LocalStorage} from 'ionic-angular';
import {Pipe, PipeTransform, Injectable} from 'angular2/core'
import {Pipe, PipeTransform, Injectable} from '@angular/core'


@Pipe({name: 'cleanLocalData'})
Expand Down
6 changes: 3 additions & 3 deletions demos/local-storage/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ion-item>
<ion-label>Key</ion-label>
<ion-select [(ngModel)]="myItem.key">
<ion-option *ngFor="#key of keys" [value]="key">
<ion-option *ngFor="let key of keys" [value]="key">
{{ key }}
</ion-option>
</ion-select>
Expand All @@ -20,7 +20,7 @@
<ion-item>
<ion-label>Value</ion-label>
<ion-select [(ngModel)]="myItem.value">
<ion-option *ngFor="#value of values" [value]="value">
<ion-option *ngFor="let value of values" [value]="value">
{{ value }}
</ion-option>
</ion-select>
Expand All @@ -42,7 +42,7 @@
<ion-label>Key</ion-label>
<ion-select [(ngModel)]="delKey">
<ion-option checked>Select a Key</ion-option>
<ion-option *ngFor="#key of addedKeys" [value]="key">
<ion-option *ngFor="let key of addedKeys" [value]="key">
{{ key }}
</ion-option>
</ion-select>
Expand Down
2 changes: 1 addition & 1 deletion demos/refresher/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {App, Page, Refresher} from 'ionic-angular';
import {Injectable} from 'angular2/core';
import {Injectable} from '@angular/core';

/**
* Mock Data Access Object
Expand Down
2 changes: 1 addition & 1 deletion demos/refresher/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ion-refresher>

<ion-list>
<ion-item *ngFor="#item of items">
<ion-item *ngFor="let item of items">
{{ item }}
</ion-item>
</ion-list>
Expand Down
2 changes: 1 addition & 1 deletion demos/select/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
<ion-item>
<ion-label>Pets</ion-label>
<ion-select [(ngModel)]="pets" multiple="true" [alertOptions]="petAlertOpts">
<ion-option *ngFor="#o of petData" [value]="o.value">{{o.text}}</ion-option>
<ion-option *ngFor="let o of petData" [value]="o.value">{{o.text}}</ion-option>
</ion-select>
</ion-item>

Expand Down
2 changes: 1 addition & 1 deletion demos/slides/main.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<ion-slides loop="true" style="background-color: black">
<ion-slide *ngFor="#image of [1,2,3,4,5]">
<ion-slide *ngFor="let image of [1,2,3,4,5]">
<img data-src="./slide{{image}}.jpeg">
</ion-slide>
</ion-slides>
4 changes: 2 additions & 2 deletions ionic/components/action-sheet/action-sheet.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Renderer, ElementRef, HostListener, ViewEncapsulation} from 'angular2/core';
import {Component, Renderer, ElementRef, HostListener, ViewEncapsulation} from '@angular/core';

import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
Expand Down Expand Up @@ -221,7 +221,7 @@ export class ActionSheet extends ViewController {
'<div class="action-sheet-group">' +
'<div class="action-sheet-title" id="{{hdrId}}" *ngIf="d.title">{{d.title}}</div>' +
'<div class="action-sheet-sub-title" id="{{descId}}" *ngIf="d.subTitle">{{d.subTitle}}</div>' +
'<button category="action-sheet-button" (click)="click(b)" *ngFor="#b of d.buttons" class="disable-hover" [ngClass]="b.cssClass">' +
'<button category="action-sheet-button" (click)="click(b)" *ngFor="let b of d.buttons" class="disable-hover" [ngClass]="b.cssClass">' +
'<ion-icon [name]="b.icon" *ngIf="b.icon" class="action-sheet-icon"></ion-icon> ' +
'{{b.text}}' +
'</button>' +
Expand Down
10 changes: 5 additions & 5 deletions ionic/components/alert/alert.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ElementRef, Renderer, HostListener, ViewEncapsulation} from 'angular2/core';
import {Component, ElementRef, Renderer, HostListener, ViewEncapsulation} from '@angular/core';

import {Animation} from '../../animations/animation';
import {Transition, TransitionOptions} from '../../transitions/transition';
Expand Down Expand Up @@ -322,7 +322,7 @@ export class Alert extends ViewController {

'<template ngSwitchWhen="radio">' +
'<div class="alert-radio-group" role="radiogroup" [attr.aria-labelledby]="hdrId" [attr.aria-activedescendant]="activeId">' +
'<button category="alert-radio-button" *ngFor="#i of d.inputs" (click)="rbClick(i)" [attr.aria-checked]="i.checked" [attr.id]="i.id" class="alert-tappable alert-radio" role="radio">' +
'<button category="alert-radio-button" *ngFor="let i of d.inputs" (click)="rbClick(i)" [attr.aria-checked]="i.checked" [attr.id]="i.id" class="alert-tappable alert-radio" role="radio">' +
'<div class="alert-radio-icon"><div class="alert-radio-inner"></div></div>' +
'<div class="alert-radio-label">' +
'{{i.label}}' +
Expand All @@ -333,7 +333,7 @@ export class Alert extends ViewController {

'<template ngSwitchWhen="checkbox">' +
'<div class="alert-checkbox-group">' +
'<button category="alert-checkbox-button" *ngFor="#i of d.inputs" (click)="cbClick(i)" [attr.aria-checked]="i.checked" class="alert-tappable alert-checkbox" role="checkbox">' +
'<button category="alert-checkbox-button" *ngFor="let i of d.inputs" (click)="cbClick(i)" [attr.aria-checked]="i.checked" class="alert-tappable alert-checkbox" role="checkbox">' +
'<div class="alert-checkbox-icon"><div class="alert-checkbox-inner"></div></div>' +
'<div class="alert-checkbox-label">' +
'{{i.label}}' +
Expand All @@ -344,15 +344,15 @@ export class Alert extends ViewController {

'<template ngSwitchDefault>' +
'<div class="alert-input-group">' +
'<div *ngFor="#i of d.inputs" class="alert-input-wrapper">' +
'<div *ngFor="let i of d.inputs" class="alert-input-wrapper">' +
'<input [placeholder]="i.placeholder" [(ngModel)]="i.value" [type]="i.type" class="alert-input">' +
'</div>' +
'</div>' +
'</template>' +

'</div>' +
'<div class="alert-button-group" [ngClass]="{vertical: d.buttons.length>2}">' +
'<button category="alert-button" *ngFor="#b of d.buttons" (click)="btnClick(b)" [ngClass]="b.cssClass">' +
'<button category="alert-button" *ngFor="let b of d.buttons" (click)="btnClick(b)" [ngClass]="b.cssClass">' +
'{{b.text}}' +
'</button>' +
'</div>' +
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/alert/test/dismiss/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Alert, Loading, NavController, App, Page } from '../../../../../ionic/index';
import { FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators } from 'angular2/common';
import { FORM_DIRECTIVES, FormBuilder, ControlGroup, Validators } from '@angular/common';


@Page({
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/app/app.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Injectable, Injector} from 'angular2/core';
import {Title} from 'angular2/platform/browser';
import {Injectable, Injector} from '@angular/core';
import {Title} from '@angular/platform-browser';

import {Config} from '../../config/config';
import {ClickBlock} from '../../util/click-block';
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/app/test/storage/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component} from 'angular2/core';
import {Control, ControlGroup} from 'angular2/common';
import {Component} from '@angular/core';
import {Control, ControlGroup} from '@angular/common';

import {App, Storage, LocalStorage, SqlStorage} from '../../../../../ionic';

Expand Down
2 changes: 1 addition & 1 deletion ionic/components/badge/badge.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, ElementRef, Renderer, Attribute} from 'angular2/core';
import {Directive, ElementRef, Renderer, Attribute} from '@angular/core';

import {Config} from '../../config/config';

Expand Down
2 changes: 1 addition & 1 deletion ionic/components/button/button.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ElementRef, Renderer, Attribute, Optional, Input, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {Component, ElementRef, Renderer, Attribute, Optional, Input, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';

import {Config} from '../../config/config';
import {Toolbar} from '../toolbar/toolbar';
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/checkbox/checkbox.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Optional, Input, Output, EventEmitter, HostListener, Provider, forwardRef, ViewEncapsulation} from 'angular2/core';
import {NG_VALUE_ACCESSOR} from 'angular2/common';
import {Component, Optional, Input, Output, EventEmitter, HostListener, Provider, forwardRef, ViewEncapsulation} from '@angular/core';
import {NG_VALUE_ACCESSOR} from '@angular/common';

import {Form} from '../../util/form';
import {Item} from '../item/item';
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/checkbox/test/basic/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import {
NgControlName,
NgFormModel,
FormBuilder
} from 'angular2/common';
} from '@angular/common';


@App({
Expand Down
8 changes: 4 additions & 4 deletions ionic/components/content/content.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ElementRef, Optional, NgZone, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {Component, ElementRef, Optional, NgZone, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';

import {Ion} from '../ion';
import {IonicApp} from '../app/app';
Expand Down Expand Up @@ -28,7 +28,7 @@ import {ScrollView} from '../../util/scroll-view';
* you can use Angular's `@ViewChild` annotation:
*
* ```ts
* import {ViewChild} from 'angular2/core';
* import {ViewChild} from '@angular/core';
* import {Content} from 'ionic-angular';
*
* @Page({...}
Expand Down Expand Up @@ -217,7 +217,7 @@ export class Content extends Ion {
* Scroll to the specified position.
*
* ```ts
* import {ViewChild} from 'angular2/core';
* import {ViewChild} from '@angular/core';
* import {Content} from 'ionic-angular';
*
* @Page({
Expand Down Expand Up @@ -248,7 +248,7 @@ export class Content extends Ion {
* Scroll to the top of the content component.
*
* ```ts
* import {ViewChild} from 'angular2/core';
* import {ViewChild} from '@angular/core';
* import {Content} from 'ionic-angular';
*
* @Page({
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/icon/icon.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, ElementRef, Renderer, Input} from 'angular2/core';
import {Directive, ElementRef, Renderer, Input} from '@angular/core';

import {Config} from '../../config/config';

Expand Down
2 changes: 1 addition & 1 deletion ionic/components/img/img.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Input, ElementRef, ChangeDetectionStrategy, ViewEncapsulation, NgZone} from 'angular2/core';
import {Component, Input, ElementRef, ChangeDetectionStrategy, ViewEncapsulation, NgZone} from '@angular/core';

import {nativeRaf} from '../../util/dom';
import {isPresent} from '../../util/util';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, Input, ViewEncapsulation} from 'angular2/core';
import {Component, Input, ViewEncapsulation} from '@angular/core';

import {Config} from '../../config/config';
import {InfiniteScroll} from './infinite-scroll';
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/infinite-scroll/infinite-scroll.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, Input, Output, EventEmitter, Host, NgZone, ElementRef} from 'angular2/core';
import {Directive, Input, Output, EventEmitter, Host, NgZone, ElementRef} from '@angular/core';

import {Content} from '../content/content';

Expand All @@ -19,7 +19,7 @@ import {Content} from '../content/content';
* <ion-content>
*
* <ion-list>
* <ion-item *ngFor="#i of items">{{i}}</ion-item>
* <ion-item *ngFor="let i of items">{{i}}</ion-item>
* </ion-list>
*
* <ion-infinite-scroll (infinite)="doInfinite($event)">
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/infinite-scroll/test/basic/index.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ViewChild} from 'angular2/core';
import {ViewChild} from '@angular/core';
import {App, Page, InfiniteScroll, NavController} from '../../../../../ionic';


Expand Down
2 changes: 1 addition & 1 deletion ionic/components/infinite-scroll/test/basic/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</button>

<ion-list>
<button ion-item (click)="goToPage2()" *ngFor="#item of items">
<button ion-item (click)="goToPage2()" *ngFor="let item of items">
{{ item }}
</button>
</ion-list>
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/infinite-scroll/test/short-list/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<ion-content>

<ion-list>
<ion-item *ngFor="#item of items">
<ion-item *ngFor="let item of items">
{{ item }}
</ion-item>
</ion-list>
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/input/input-base.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Directive, Input, Output, EventEmitter, HostListener, ViewChild, ElementRef} from 'angular2/core';
import {NgControl} from 'angular2/common';
import {Directive, Input, Output, EventEmitter, HostListener, ViewChild, ElementRef} from '@angular/core';
import {NgControl} from '@angular/common';

import {Config} from '../../config/config';
import {Content} from '../content/content';
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/input/input.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Component, Optional, ElementRef, ViewChild, ViewEncapsulation} from 'angular2/core';
import {NgControl} from 'angular2/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';
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/input/native-input.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {Directive, Attribute, ElementRef, Renderer, Input, Output, EventEmitter, HostListener} from 'angular2/core';
import {NgControl} from 'angular2/common';
import {Directive, Attribute, ElementRef, Renderer, Input, Output, EventEmitter, HostListener} from '@angular/core';
import {NgControl} from '@angular/common';

import {Config} from '../../config/config';
import {CSS, hasFocus} from '../../util/dom';
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/input/test/form-inputs/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import {App} from '../../../../../ionic';
import {FormBuilder, Validators} from 'angular2/common';
import {FormBuilder, Validators} from '@angular/common';


@App({
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/ion.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {ElementRef} from 'angular2/core';
import {ElementRef} from '@angular/core';
import * as dom from '../util/dom';

let ids: number = 0;
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/item/item-sliding.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ElementRef, Optional, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {Component, ElementRef, Optional, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';

import {List} from '../list/list';

Expand All @@ -12,7 +12,7 @@ import {List} from '../list/list';
* @usage
* ```html
* <ion-list>
* <ion-item-sliding *ngFor="#item of items">
* <ion-item-sliding *ngFor="let item of items">
* <button ion-item (click)="itemTapped(item)">
* {{item.title}}
* </button>
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/item/item.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Component, ContentChildren, forwardRef, ViewChild, ContentChild, Renderer, ElementRef, ChangeDetectionStrategy, ViewEncapsulation} from 'angular2/core';
import {Component, ContentChildren, forwardRef, ViewChild, ContentChild, Renderer, ElementRef, ChangeDetectionStrategy, ViewEncapsulation} from '@angular/core';

import {Button} from '../button/button';
import {Form} from '../../util/form';
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/item/test/buttons/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
<button outline item-right (click)="testClick($event)">View</button>
</ion-item>

<button ion-item *ngFor="#data of [0,1,2,3,4]; #i = index" [class.activated]="i == 1" (click)="testClick($event)">
<button ion-item *ngFor="let data of [0,1,2,3,4]; #i = index" [class.activated]="i == 1" (click)="testClick($event)">
<ion-avatar item-left>
<img src="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAAAAACH5BAAAAAAALAAAAAABAAEAAAICTAEAOw==">
</ion-avatar>
Expand Down
4 changes: 2 additions & 2 deletions ionic/components/item/test/groups/session-list.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
<ion-content class="outer-content">

<ion-list>
<ion-item-group *ngFor="#timeSlot of data">
<ion-item-group *ngFor="let timeSlot of data">

<ion-item-divider sticky>
{{timeSlot.time}}
</ion-item-divider>

<ion-item-sliding *ngFor="#session of timeSlot.talks" [attr.category]="session.category" #slidingItem>
<ion-item-sliding *ngFor="let session of timeSlot.talks" [attr.category]="session.category" #slidingItem>
<button ion-item (click)="openSession(session)">
<h3>{{session.name}}</h3>
<p>
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/item/test/sliding/main.html
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ <h2>Two Lines w/ Thumbnail, H2 Header</h2>
</ion-item-options>
</ion-item-sliding>

<ion-item-sliding *ngFor="#data of items" #item>
<ion-item-sliding *ngFor="let data of items" #item>
<ion-item text-wrap detail-push>
<h3>ng-for {{data}}</h3>
</ion-item>
Expand Down
2 changes: 1 addition & 1 deletion ionic/components/label/label.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from 'angular2/core';
import {Directive, ElementRef, Renderer, Input, Optional, Attribute} from '@angular/core';


/**
Expand Down

0 comments on commit 4b36c34

Please sign in to comment.