diff --git a/playground/basic-example/index.html b/playground/basic-example/index.html index ad23935ab8..8fa6d3cb8f 100644 --- a/playground/basic-example/index.html +++ b/playground/basic-example/index.html @@ -9,16 +9,16 @@ - - - + + + - - + +
@@ -29,7 +29,13 @@ diff --git a/playground/basic-example/main.js b/playground/basic-example/main.js index ddcc1c6aab..9ac7cecfef 100644 --- a/playground/basic-example/main.js +++ b/playground/basic-example/main.js @@ -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] }) diff --git a/src/components/ion.js b/src/components/ion.js index d835224002..ad1714d93f 100644 --- a/src/components/ion.js +++ b/src/components/ion.js @@ -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) { diff --git a/src/components/tabbar/mixins/android/android-tabbar.js b/src/components/tabbar/mixins/android/android-tabbar.js index c087f6be8e..6d4470361c 100644 --- a/src/components/tabbar/mixins/android/android-tabbar.js +++ b/src/components/tabbar/mixins/android/android-tabbar.js @@ -8,9 +8,10 @@ TabbarConfig.platform('android') // Draggable(tabbar) // tabbarInstance.setAsHeader() - tabbar.assign({ + tabbar.extend({ press() { alert('pressing from android mixin'); } }); }); + diff --git a/src/core/mixins/draggable.js b/src/core/mixins/draggable.js new file mode 100644 index 0000000000..e69de29bb2