mirror of
https://github.com/ionic-team/ionic-framework.git
synced 2025-08-22 21:48:42 +08:00
Polish mixins
This commit is contained in:
@ -22,9 +22,9 @@
|
||||
|
||||
</head>
|
||||
<body>
|
||||
<playground-main>
|
||||
<div playground-main>
|
||||
Loading...
|
||||
</playground-main>
|
||||
</div>
|
||||
</body>
|
||||
|
||||
<!-- Application bootstrap logic -->
|
||||
|
@ -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]
|
||||
|
@ -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();
|
||||
}
|
||||
|
5
src/components/view-group/view-group.js
Normal file
5
src/components/view-group/view-group.js
Normal file
@ -0,0 +1,5 @@
|
||||
import {Ion} from '../ion';
|
||||
|
||||
export class ViewGroup extends Ion {
|
||||
|
||||
}
|
@ -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;
|
||||
|
Reference in New Issue
Block a user