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

Merge branch 'master' into searchbar-fix

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2015-12-10 17:55:44 -05:00
parent ab4ad905a8
commit ff8169cb0a
84 changed files with 634 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ionic/components/text-input/label.ts
View File

@ -1,4 +1,4 @@
import {Directive, Optional, ElementRef, Renderer} from 'angular2/angular2';
import {Directive, Optional, ElementRef, Renderer} from 'angular2/core';
import {Config} from '../../config/config';
import {TextInput} from './text-input';

2
ionic/components/text-input/test/form-inputs/index.ts
View File

@ -1,5 +1,5 @@
import {App} from 'ionic/ionic';
import {FormBuilder, Validators} from 'angular2/angular2';
import {FormBuilder, Validators} from 'angular2/common';
@App({

1
ionic/components/text-input/test/inline-labels/index.ts
View File

@ -7,7 +7,6 @@ import {App} from 'ionic/ionic';
class E2EApp {
submit(ev) {
debugger
}
}

3
ionic/components/text-input/text-input.ts
View File

@ -1,4 +1,5 @@
import {Component, Directive, Attribute, NgIf, forwardRef, Host, Optional, ElementRef, Renderer, Attribute, NgControl} from 'angular2/angular2';
import {Component, Directive, Attribute, forwardRef, Host, Optional, ElementRef, Renderer} from 'angular2/core';
import {NgIf, NgControl} from 'angular2/common';
import {NavController} from '../nav/nav-controller';
import {Config} from '../../config/config';