diff --git a/ionic/components/app/test/weather/index.js b/ionic/components/app/test/weather/index.js
index 8efcd45f54..c688a7076a 100644
--- a/ionic/components/app/test/weather/index.js
+++ b/ionic/components/app/test/weather/index.js
@@ -9,8 +9,6 @@ import {Geo} from './geo';
import {Weather} from './weather';
import {Flickr} from './flickr';
-console.log('Imported', Geo, Weather, Flickr);
-
@Component({
selector: 'ion-app',
appInjector: [Modal]
@@ -43,7 +41,7 @@ class WeatherApp {
}
showSettings() {
- this.Modal.show(SettingsModal).then((settingsModal) => {
+ this.Modal.open(SettingsModal).then((settingsModal) => {
this.settingsModal = settingsModal;
});
}
@@ -134,9 +132,39 @@ class WeatherApp {
@IonicComponent(Modal)
@IonicView({
- template: ''
+ template: `
+
+ Settings
+
+
+
+
+ `,
+ directives: [formDirectives]
})
-export class SettingsModal extends Modal {}
+export class SettingsModal extends Modal {
+ constructor(fb: FormBuilder) {
+ this.settingsForm = fb.group({
+ mapStyle: ['hybrid', Validators.required]
+ });
+ }
+}
export function main(ionicBootstrap) {
ionicBootstrap(WeatherApp);
diff --git a/ionic/components/app/test/weather/style.css b/ionic/components/app/test/weather/style.css
index 9cb891ba19..5f8780d572 100644
--- a/ionic/components/app/test/weather/style.css
+++ b/ionic/components/app/test/weather/style.css
@@ -222,7 +222,11 @@ current-weather .current-temp {
*/
#settings-modal {
+ background-color: rgba(0,0,0,0.8) !important;
+}
+#settings-modal ion-toolbar {
background-color: rgba(0,0,0,0.8);
+ color: #fff;
}
#settings-modal .item {
diff --git a/ionic/components/segment/segment.js b/ionic/components/segment/segment.js
index e93ac0ef6a..6e59d0b94c 100644
--- a/ionic/components/segment/segment.js
+++ b/ionic/components/segment/segment.js
@@ -12,17 +12,20 @@ import {IonicDirective, IonicComponent, IonicView} from '../../config/annotation
@IonicDirective({
selector: 'ion-segment',
+ //properties: ['value'],
host: {
'(change)': 'onChange($event.target.value)',
'(input)': 'onChange($event.target.value)',
'(blur)': 'onTouched()',
- '[value]': 'value',
+ //'[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 {
@@ -74,13 +77,15 @@ export class Segment {
host: {
'(click)': 'buttonClicked($event)',
'(change)': 'onChange($event)',
- '[value]': 'value',
+ //'[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'
+ */
}
}
}