From 6b37f2c22387fba0212ed3dfc9b9e69e3db9cfdc Mon Sep 17 00:00:00 2001 From: Andrew Date: Wed, 18 Mar 2015 10:56:10 -0500 Subject: [PATCH] move playground things --- .jshintrc | 4 ++++ gulpfile.js | 2 +- playground/{ => basic-example}/index.html | 0 playground/{ => basic-example}/main.html | 2 -- playground/{ => basic-example}/main.js | 2 +- src/components/sidemenu/sidemenu.js | 7 +++++++ src/components/sidemenu/sidemenu.scss | 0 src/components/sidemenu/sidemenu.spec.js | 0 src/components/tabbar/mixins/android/android-tabbar.js | 6 +++--- 9 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 .jshintrc rename playground/{ => basic-example}/index.html (100%) rename playground/{ => basic-example}/main.html (60%) rename playground/{ => basic-example}/main.js (92%) create mode 100644 src/components/sidemenu/sidemenu.js create mode 100644 src/components/sidemenu/sidemenu.scss create mode 100644 src/components/sidemenu/sidemenu.spec.js diff --git a/.jshintrc b/.jshintrc new file mode 100644 index 0000000000..77ba89791e --- /dev/null +++ b/.jshintrc @@ -0,0 +1,4 @@ +{ + "esnext": true, + "expr": true +} diff --git a/gulpfile.js b/gulpfile.js index 180e70e3c1..58c6f400d3 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -15,7 +15,7 @@ var sass = require('gulp-sass'); var config = { dist: 'dist', src: { - js: 'src/**/*.js', + js: ['src/**/*.js', '!src/**/*.spec.js'], html: 'src/**/*.html', playgroundJs: 'playground/**/*.js', playgroundFiles: ['playground/**/*', '!playground/**/*.js'], diff --git a/playground/index.html b/playground/basic-example/index.html similarity index 100% rename from playground/index.html rename to playground/basic-example/index.html diff --git a/playground/main.html b/playground/basic-example/main.html similarity index 60% rename from playground/main.html rename to playground/basic-example/main.html index ed98f92bdb..e7ec122ecc 100644 --- a/playground/main.html +++ b/playground/basic-example/main.html @@ -1,5 +1,3 @@ - - diff --git a/playground/main.js b/playground/basic-example/main.js similarity index 92% rename from playground/main.js rename to playground/basic-example/main.js index 6659977551..ddcc1c6aab 100644 --- a/playground/main.js +++ b/playground/basic-example/main.js @@ -11,4 +11,4 @@ import 'ionic/components/tabbar/mixins/android/android-tabbar'; }) class PlaygroundMain {} -bootstrap(PlaygroundMain); +bootstrap(PlaygroundMain) diff --git a/src/components/sidemenu/sidemenu.js b/src/components/sidemenu/sidemenu.js new file mode 100644 index 0000000000..5e70ee581f --- /dev/null +++ b/src/components/sidemenu/sidemenu.js @@ -0,0 +1,7 @@ +import {Component, Template} from 'angular2/angular2'; +import {ViewGroup} from '../view-group'; + +class Sidemenu extends ViewGroup { + constructor() { + } +} diff --git a/src/components/sidemenu/sidemenu.scss b/src/components/sidemenu/sidemenu.scss new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/sidemenu/sidemenu.spec.js b/src/components/sidemenu/sidemenu.spec.js new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/components/tabbar/mixins/android/android-tabbar.js b/src/components/tabbar/mixins/android/android-tabbar.js index d99eae8792..c087f6be8e 100644 --- a/src/components/tabbar/mixins/android/android-tabbar.js +++ b/src/components/tabbar/mixins/android/android-tabbar.js @@ -1,12 +1,12 @@ import {TabbarConfig} from '../../tabbar'; -// import {Draggable} from '/behaviors/draggable'; +// import {Draggable} from '/behaviors/draggable' TabbarConfig.platform('android') .template('./android-template.html') .mixin(function(tabbar) { - // Draggable(tabbar); - // tabbarInstance.setAsHeader(); + // Draggable(tabbar) + // tabbarInstance.setAsHeader() tabbar.assign({ press() {