test(): test

This commit is contained in:
Andrew
2015-03-18 13:27:27 -05:00
parent 53f2d35686
commit 5a5ead5db6
4 changed files with 5 additions and 9 deletions

View File

@@ -23,7 +23,7 @@
<!-- Third party imports -->
<script src="/lib/angular2.js"></script>
<script src="/lib/zone.js"></script>
<!-- <script src="/lib/hammer.js"></script> -->
<script src="/lib/hammer.js"></script>
</head>
<body>
@@ -35,11 +35,6 @@
<!-- Application bootstrap logic -->
<script>
System.baseURL = 'http://localhost:9000/';
//System.register('hammerjs', function() {
// return {
// Hammer: window.Hammer
// }
//});
System.register({
map: {
'ionic': '../ionic'

View File

@@ -2,7 +2,6 @@ import {bootstrap} from 'angular2/core';
import {Component, Template} from 'angular2/angular2';
import {Tabbar} from 'ionic/components/tabbar/tabbar';
import {Modal} from 'ionic/components/modal/modal';
// import {Hammer} from 'hammerjs';
import 'ionic/components/tabbar/mixins/android/android-tabbar';

View File

@@ -13,11 +13,11 @@ export var TabbarConfig = new IonConfigService();
services: [TabbarConfig]
})
@Template({
inline: `<button (click)="press()">Tabbar: {{title}}</button>`
inline: `<button (click)="press()">Tabbar: {{title}} {{$config.id}}</button>`
})
export class Tabbar extends Ion {
constructor(
@Inject(TabbarConfig) config
config: TabbarConfig
) {
this.$config = config;
super();

View File

@@ -1,5 +1,6 @@
import * as Platform from './platform';
var id = 0;
export function IonConfigService() {
function Config() {
@@ -7,6 +8,7 @@ export function IonConfigService() {
for (var key in Config._platforms) {
this._platforms[key] = Config._platforms[key]._clone();
}
this.id = id++;
}
Config._platforms = {};
Config.platform = platformFn.bind(Config);