diff --git a/playground/index.html b/playground/index.html index 3d75b9da60..ad23935ab8 100644 --- a/playground/index.html +++ b/playground/index.html @@ -22,9 +22,9 @@ - +
Loading... - +
diff --git a/playground/main.js b/playground/main.js index 6b30f11798..6659977551 100644 --- a/playground/main.js +++ b/playground/main.js @@ -4,7 +4,7 @@ import {Tabbar} from 'ionic/components/tabbar/tabbar'; import 'ionic/components/tabbar/mixins/android/android-tabbar'; -@Component({ selector: 'playground-main' }) +@Component({ selector: '[playground-main]' }) @Template({ url: 'main.html', directives: [Tabbar] diff --git a/src/components/tabbar/tabbar.js b/src/components/tabbar/tabbar.js index 9a7ac063fe..6f273a60dc 100644 --- a/src/components/tabbar/tabbar.js +++ b/src/components/tabbar/tabbar.js @@ -3,7 +3,7 @@ import {Inject} from 'angular2/di'; import {Ion} from '../ion'; import {IonConfigService} from '../../config'; -export var TabbarConfig = IonConfigService(); +export var TabbarConfig = new IonConfigService(); @Component({ selector: 'ion-tabbar', @@ -17,12 +17,8 @@ export var TabbarConfig = IonConfigService(); }) export class Tabbar extends Ion { constructor( - // Creates a TabbarConfig instance for this specific instance of Tabbar. - // this instance is created with a cloned version of all the globally - // set config properties. @Inject(TabbarConfig) config ) { - debugger; this.$config = config; super(); } diff --git a/src/components/view-group/view-group.js b/src/components/view-group/view-group.js new file mode 100644 index 0000000000..3da5c86214 --- /dev/null +++ b/src/components/view-group/view-group.js @@ -0,0 +1,5 @@ +import {Ion} from '../ion'; + +export class ViewGroup extends Ion { + +} diff --git a/src/config.js b/src/config.js index 04f3f72e9f..af29ba88a4 100644 --- a/src/config.js +++ b/src/config.js @@ -1,6 +1,5 @@ import * as Platform from './platform'; -var i = 0; export function IonConfigService() { function Config() { @@ -20,7 +19,6 @@ export function IonConfigService() { return Config; } - class SubConfig { constructor(name, mixins = [], template = '') { this._name = name;