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

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

@ -1,3 +1,4 @@
console.log('hello');
import {bootstrap} from 'angular2/core'; import {bootstrap} from 'angular2/core';
import {Component, Template} from 'angular2/angular2'; import {Component, Template} from 'angular2/angular2';
import {Tabbar} from 'ionic/components/tabbar/tabbar'; import {Tabbar} from 'ionic/components/tabbar/tabbar';

4
src/components/ion.js
View File

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

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

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

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