diff --git a/gulpfile.js b/gulpfile.js index 58c6f400d3..f3a89ae0af 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -25,6 +25,7 @@ var config = { 'node_modules/es6-module-loader/dist/es6-module-loader-sans-promises.src.js', 'node_modules/systemjs/lib/extension-register.js', 'node_modules/angular2/node_modules/zone.js/zone.js', + 'node_modules/hammerjs/hammer.js' ] }; diff --git a/package.json b/package.json index 03b9f64baa..9a4bc277fd 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "angular2": "2.0.0-alpha.13", "es6-module-loader": "~0.11.0", + "hammerjs": "^2.0.4", "systemjs": "~0.11.0", "zone.js": "0.4.1" } diff --git a/playground/basic-example/index.html b/playground/basic-example/index.html index 8fa6d3cb8f..965e013d5d 100644 --- a/playground/basic-example/index.html +++ b/playground/basic-example/index.html @@ -16,9 +16,10 @@ register(System); - + + @@ -29,13 +30,18 @@ diff --git a/playground/basic-example/main.js b/playground/basic-example/main.js index 9ac7cecfef..aaa9be9ee0 100644 --- a/playground/basic-example/main.js +++ b/playground/basic-example/main.js @@ -1,7 +1,7 @@ -console.log('hello'); import {bootstrap} from 'angular2/core'; import {Component, Template} from 'angular2/angular2'; import {Tabbar} from 'ionic/components/tabbar/tabbar'; +// import {Hammer} from 'hammerjs'; import 'ionic/components/tabbar/mixins/android/android-tabbar'; diff --git a/src/core/gestures/edgePanGesture b/src/core/gestures/edgePanGesture new file mode 100644 index 0000000000..e69de29bb2 diff --git a/src/core/gestures/panGesture.js b/src/core/gestures/panGesture.js new file mode 100644 index 0000000000..8b13789179 --- /dev/null +++ b/src/core/gestures/panGesture.js @@ -0,0 +1 @@ +