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

Default platform to ios

Browse Source
This commit is contained in:
Max Lynch
2015-06-01 16:33:49 -05:00
parent 8b36983277
commit add20aca9c
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ionic/components/form/test/basic/index.js
View File

@ -2,16 +2,16 @@ import {bootstrap} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
//import {Button, Switch, Form, List, Label, Item, Input, Content} from 'ionic/ionic'; //import {Button, Switch, Form, List, Label, Item, Input, Content} from 'ionic/ionic';
import {IONIC_DIRECTIVES} from 'ionic/ionic' import {IONIC_DIRECTIVES} from 'ionic/ionic'
console.log([FormDirectives].concat(IONIC_DIRECTIVES)); console.log([formDirectives].concat(IONIC_DIRECTIVES));
@Component({ selector: 'ion-app' }) @Component({ selector: 'ion-app' })
@View({ @View({
templateUrl: 'main.html', templateUrl: 'main.html',
directives: [FormDirectives].concat(IONIC_DIRECTIVES) directives: [formDirectives].concat(IONIC_DIRECTIVES)
}) })
class IonicApp { class IonicApp {
constructor() { constructor() {

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

@ -1,15 +1,17 @@
import {bootstrap, Switch, SwitchWhen} from 'angular2/angular2' import {bootstrap, NgSwitch, NgSwitchWhen} from 'angular2/angular2'
import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations';
import {View} from 'angular2/src/core/annotations_impl/view'; import {View} from 'angular2/src/core/annotations_impl/view';
import {Segment, SegmentButton, Content, Button} from 'ionic/ionic'; import {Segment, SegmentButton, Content, Button} from 'ionic/ionic';
import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
//import {IONIC_DIRECTIVES} from 'ionic/ionic' //import {IONIC_DIRECTIVES} from 'ionic/ionic'
console.log('Loaded', formDirectives, Segment, SegmentButton, Content, Button, NgSwitch, NgSwitchWhen);
@Component({ selector: 'ion-app' }) @Component({ selector: 'ion-app' })
@View({ @View({
templateUrl: 'main.html', templateUrl: 'main.html',
directives: [FormDirectives].concat([Segment, SegmentButton, Content, Button, Switch, SwitchWhen]) directives: [formDirectives].concat([Segment, SegmentButton, Content, Button, NgSwitch, NgSwitchWhen])
}) })
class IonicApp { class IonicApp {
constructor() { constructor() {

8
ionic/platform/platform.js
View File

@ -32,6 +32,10 @@ class PlatformController {
registry[platform.name] = platform; registry[platform.name] = platform;
} }
getPlatform(name) {
return registry[name];
}
set(platform) { set(platform) {
activePlatform = platform; activePlatform = platform;
@ -92,7 +96,7 @@ Platform.register({
// Last case is a catch-all // Last case is a catch-all
Platform.setDefault({ Platform.setDefault({
name: 'core' name: 'ios'
}); });
Platform.set( Platform.detect() ); Platform.set( Platform.get('ios') );//Platform.detect() );