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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Adam Bradley
2015-07-03 13:51:38 -05:00
parent 90d6564c10 eaf6746034
commit fbb6abb1bb
2 changed files with 2 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/scroll/test/basic/index.ts
View File

@ -7,7 +7,7 @@ import {IonicView} from 'ionic/ionic';
@IonicView({
templateUrl: 'main.html'
})
class IonicApp {
class MyApp {
constructor() {
console.log('IonicApp Start')
}
@ -17,5 +17,5 @@ class IonicApp {
}
export function main(ionicBootstrap) {
ionicBootstrap(IonicApp);
ionicBootstrap(MyApp);
}

43
ionic/components/segment/segment.ts
View File

@ -193,46 +193,3 @@ export class SegmentButton {
}
}
@IonicDirective({
selector: 'ion-segment',
host: {
'(change)': 'onChange($event.target.value)',
'(input)': 'onChange($event.target.value)',
'(blur)': 'onTouched()',
'[value]': 'value',
'[class.ng-untouched]': 'cd.control?.untouched == true',
'[class.ng-touched]': 'cd.control?.touched == true',
'[class.ng-pristine]': 'cd.control?.pristine == true',
'[class.ng-dirty]': 'cd.control?.dirty == true',
'[class.ng-valid]': 'cd.control?.valid == true',
'[class.ng-invalid]': 'cd.control?.valid == false'
}
})
export class SegmentControlValueAccessor {
constructor(cd: NgControl, renderer: Renderer, elementRef: ElementRef, segment: Segment) {
this.onChange = (_) => {};
this.onTouched = (_) => {};
this.cd = cd;
this.renderer = renderer;
this.elementRef = elementRef;
this.segment = segment;
cd.valueAccessor = this;
}
writeValue(value) {
// both this.value and setProperty are required at the moment
// remove when a proper imperative API is provided
this.value = !value ? '' : value;
this.renderer.setElementProperty(this.elementRef.parentView.render, this.elementRef.boundElementIndex, 'value', this.value);
this.segment.value = this.value;
this.segment.selectFromValue(value);
}
registerOnChange(fn) { this.onChange = fn; }
registerOnTouched(fn) { this.onTouched = fn; }
}