javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-23 05:58:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish mixins

Browse Source
This commit is contained in:
Andrew
2015-03-18 09:19:35 -05:00
parent 6d8224517d
commit 029fbc0370
5 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playground/index.html
View File

@ -22,9 +22,9 @@
</head> </head>
<body> <body>
<playground-main> <div playground-main>
Loading... Loading...
</playground-main> </div>
</body> </body>
<!-- Application bootstrap logic --> <!-- Application bootstrap logic -->

2
playground/main.js
View File

@ -4,7 +4,7 @@ import {Tabbar} from 'ionic/components/tabbar/tabbar';
import 'ionic/components/tabbar/mixins/android/android-tabbar'; import 'ionic/components/tabbar/mixins/android/android-tabbar';
@Component({ selector: 'playground-main' }) @Component({ selector: '[playground-main]' })
@Template({ @Template({
url: 'main.html', url: 'main.html',
directives: [Tabbar] directives: [Tabbar]

6
src/components/tabbar/tabbar.js
View File

@ -3,7 +3,7 @@ import {Inject} from 'angular2/di';
import {Ion} from '../ion'; import {Ion} from '../ion';
import {IonConfigService} from '../../config'; import {IonConfigService} from '../../config';
export var TabbarConfig = IonConfigService(); export var TabbarConfig = new IonConfigService();
@Component({ @Component({
selector: 'ion-tabbar', selector: 'ion-tabbar',
@ -17,12 +17,8 @@ export var TabbarConfig = IonConfigService();
}) })
export class Tabbar extends Ion { export class Tabbar extends Ion {
constructor( 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 @Inject(TabbarConfig) config
) { ) {
debugger;
this.$config = config; this.$config = config;
super(); super();
} }

5
src/components/view-group/view-group.js Normal file
View File

@ -0,0 +1,5 @@
import {Ion} from '../ion';
export class ViewGroup extends Ion {
}

2
src/config.js
View File

@ -1,6 +1,5 @@
import * as Platform from './platform'; import * as Platform from './platform';
var i = 0;
export function IonConfigService() { export function IonConfigService() {
function Config() { function Config() {
@ -20,7 +19,6 @@ export function IonConfigService() {
return Config; return Config;
} }
class SubConfig { class SubConfig {
constructor(name, mixins = [], template = '') { constructor(name, mixins = [], template = '') {
this._name = name; this._name = name;