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

button refactor

Browse Source
This commit is contained in:
Adam Bradley
2015-06-19 12:25:10 -05:00
parent 4a254b38ca
commit fadd5a5225
43 changed files with 153 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ionic/components/segment/segment.js
View File

@@ -7,7 +7,6 @@ import {View} from 'angular2/src/core/annotations_impl/view';
import {ControlGroup, ControlDirective} from 'angular2/forms'
import {dom} from 'ionic/util';
import {IonicComponent} from 'ionic/config/component'
import {Button} from 'ionic/components/button/button'
@IonicComponent(Segment)
@@ -16,7 +15,7 @@ import {Button} from 'ionic/components/button/button'
<content></content>
</div>
`,
directives: [Button, SegmentButton]
directives: [SegmentButton]
})
export class Segment {

4
ionic/components/segment/test/basic/index.js
View File

@@ -2,14 +2,14 @@ import {NgSwitch, NgSwitchWhen} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {View} from 'angular2/src/core/annotations_impl/view';
import {Segment, SegmentButton, Content, Button} from 'ionic/ionic';
import {Segment, SegmentButton, Content} from 'ionic/ionic';
import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
@Component({ selector: 'ion-view' })
@View({
templateUrl: 'main.html',
directives: [formDirectives].concat([Segment, SegmentButton, Content, Button, NgSwitch, NgSwitchWhen])
directives: [formDirectives].concat([Segment, SegmentButton, Content, NgSwitch, NgSwitchWhen])
})
export default class IonicApp {
constructor() {