Skip to content

Commit

Permalink
chore(.bowerrc) add bower config
Browse files Browse the repository at this point in the history
chore(bower) update to latest hammerJS (>2.0)
  • Loading branch information
wzr1337 committed Oct 29, 2014
1 parent 55d9782 commit f6fcbf7
Show file tree
Hide file tree
Showing 9 changed files with 2,175 additions and 1,129 deletions.
3 changes: 3 additions & 0 deletions .bowerrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"directory": "components"
}
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
.project
node_modules
bower_components
components
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = function(grunt) {
concat : {
dist : {
files : {
'dist/gestures.js' : [ 'bower_components/hammerjs/dist/hammer.js',
'dist/gestures.js' : [ 'components/hammerjs/hammer.js',
'src/gestures.js' ]
}
}
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"angular": "~1.2.0"
},
"devDependencies": {
"hammerjs": "~1.0.5"
"hammerjs": "~2.0.0"
}
}
4 changes: 2 additions & 2 deletions demo/app/views/main.html
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<div class="hero-unit">
<h1>Angular Gestures Demo</h1>
<p>Please tap, hold, drag, pinch, swipe or rotate the following container</p>
<p>Please tap, press(hold), drag, pinch, swipe or rotate the following container</p>
<div id="container" class="btn btn-large btn-primary disabled"
hm-tap="handleGesture($event)"
hm-hold="handleGesture($event)"
hm-press="handleGesture($event)"
hm-swipe="handleGesture($event)"
hm-pinch="handleGesture($event)"
hm-drag="handleGesture($event)"
Expand Down
2 changes: 1 addition & 1 deletion dist/bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
"angular": "~1.2.0"
},
"devDependencies": {
"hammerjs": "~1.0.5"
"hammerjs": "~2.0.0"
}
}
Loading

0 comments on commit f6fcbf7

Please sign in to comment.