alpha35 update

This commit is contained in:
Adam Bradley
2015-08-19 16:06:41 -05:00
parent d83e99de43
commit 4d6d7f757d
22 changed files with 37 additions and 41 deletions

View File

@@ -1,4 +1,4 @@
import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {Log} from 'ionic/util'
import {App, IonicView, NavController} from 'ionic/ionic'

View File

@@ -1,5 +1,5 @@
import {Directive, ElementRef} from 'angular2/angular2';
import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {App, NavController, IonicView} from 'ionic/ionic';

View File

@@ -1,5 +1,5 @@
import {Component} from 'angular2/angular2';
import {Control, ControlGroup, formDirectives} from 'angular2/forms';
import {Control, ControlGroup} from 'angular2/forms';
import {App, Http} from 'ionic/ionic';

View File

@@ -1,6 +1,6 @@
import {ElementRef} from 'angular2/angular2'
import {Component, Directive} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
import {App, Modal, Animation, Content} from 'ionic/ionic';
import {NavController, NavParams, IonicView} from 'ionic/ionic';

View File

@@ -1,4 +1,4 @@
import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/angular2';
import {FormBuilder, Validators, ControlGroup} from 'angular2/angular2';
import {IonicApp, IonicView} from 'ionic/ionic';

View File

@@ -1,5 +1,5 @@
import {Component} from 'angular2/angular2';
import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {IonicApp, IonicView} from 'ionic/ionic';

View File

@@ -1,4 +1,4 @@
import {FormBuilder, Validators, formDirectives, Control, ControlGroup} from 'angular2/angular2';
import {FormBuilder, Validators, Control, ControlGroup} from 'angular2/angular2';
import {IonicView} from 'ionic/ionic';

View File

@@ -1,5 +1,5 @@
import {Component} from 'angular2/angular2';
import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {IonicView} from 'ionic/ionic';

View File

@@ -1,4 +1,4 @@
import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
import {FormBuilder, Validators, ControlGroup} from 'angular2/forms';
import {IonicApp, IonicView, NavController} from 'ionic/ionic';

View File

@@ -1,4 +1,4 @@
import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
import {FormBuilder, Control, ControlGroup, Validators} from 'angular2/forms';
import {App, IonicView, Animation, Modal, NavController, NavParams} from 'ionic/ionic';

View File

@@ -1,6 +1,6 @@
import {Component, Directive, View} from 'angular2/angular2';
import {NgIf, NgFor, CSSClass, ElementRef} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, formDirectives} from 'angular2/forms';
import {NgIf, NgFor, NgClass, ElementRef} from 'angular2/angular2';
import {FormBuilder, Control, ControlGroup, Validators, FORM_DIRECTIVES} from 'angular2/forms';
import {App, IonicView, Animation, Content, Scroll, Modal, NavController, NavParams} from 'ionic/ionic';
@@ -33,7 +33,7 @@ import {Flickr} from './flickr';
</form>
</ion-content>
</ion-view>`,
directives: [formDirectives]
directives: [FORM_DIRECTIVES]
})
export class SettingsModal {
constructor(fb: FormBuilder) {
@@ -63,8 +63,8 @@ let WEATHER_ICONS = {
]
})
@View({
template: '<i class="icon" [class]="weatherIcon"></i>',
directives: [CSSClass]
template: '<i class="icon" [ng-class]="weatherIcon"></i>',
directives: [NgClass]
})
export class WeatherIcon {
constructor() {