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

playground: fix examples

Browse Source
This commit is contained in:
Andrew
2015-03-18 11:34:02 -05:00
parent 6b37f2c223
commit d4a2336149
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
playground/basic-example/index.html
View File

@ -9,16 +9,16 @@
<meta charset="UTF-8">
<!-- ES6-related imports -->
<script src="lib/traceur-runtime.js"></script>
<script src="lib/es6-module-loader-sans-promises.src.js"></script>
<script src="lib/extension-register.js"></script>
<script src="/lib/traceur-runtime.js"></script>
<script src="/lib/es6-module-loader-sans-promises.src.js"></script>
<script src="/lib/extension-register.js"></script>
<script>
register(System);
</script>
<!-- Angular2-related imports -->
<script src="lib/angular2.js"></script>
<script src="lib/zone.js"></script>
<script src="/lib/angular2.js"></script>
<script src="/lib/zone.js"></script>
</head>
<body>
@ -29,7 +29,13 @@
<!-- Application bootstrap logic -->
<script>
System.import('./main');
System.baseURL = 'http://localhost:9000/basic-example/';
System.register({
map: {
'ionic': '../ionic'
}
});
System.import('main');
</script>
</html>

3
playground/basic-example/main.js
View File

@ -1,3 +1,4 @@
console.log('hello');
import {bootstrap} from 'angular2/core';
import {Component, Template} from 'angular2/angular2';
import {Tabbar} from 'ionic/components/tabbar/tabbar';
@ -5,7 +6,7 @@ import {Tabbar} from 'ionic/components/tabbar/tabbar';
import 'ionic/components/tabbar/mixins/android/android-tabbar';
@Component({ selector: '[playground-main]' })
@Template({
@Template({
url: 'main.html',
directives: [Tabbar]
})

4
src/components/ion.js
View File

@ -7,13 +7,13 @@ export class Ion {
var platformName = Platform.getPlatform();
var platformConfig = this.$config._platforms[platformName];
if (platformConfig) {
for (var i = 0, ii = platformConfig._mixins.length; i < ii; i++)
for (var i = 0, ii = platformConfig._mixins.length; i < ii; i++) {
platformConfig._mixins[i](this);
}
}
}
assign() {
extend() {
for (var i = 0, ii = arguments.length; i < ii; i++) {
var obj = arguments[i];
if (obj) {

3
src/components/tabbar/mixins/android/android-tabbar.js
View File

@ -8,9 +8,10 @@ TabbarConfig.platform('android')
// Draggable(tabbar)
// tabbarInstance.setAsHeader()
tabbar.assign({
tabbar.extend({
press() {
alert('pressing from android mixin');
}
});
});

0
src/core/mixins/draggable.js Normal file
View File