Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle basic touch interactions #675

Merged
merged 6 commits into from
Mar 20, 2017
Merged

Handle basic touch interactions #675

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be50238
Handle basic touch interactions.
manthey Jan 27, 2017
bf879b2
Add mapInteractor coverage tests.
manthey Mar 7, 2017
85a5573
Include hammer.js in the built external libraries.
manthey Mar 14, 2017
fe6d390
Merge branch 'master' into touch-interactions
manthey Mar 15, 2017
00c94e8
Break a long line.
manthey Mar 15, 2017
e317bf9
Merge branch 'master' into touch-interactions
manthey Mar 20, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion external.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ module.exports = {
},
resolve: {
alias: {
d3: 'd3/d3.js'
d3: 'd3/d3.js',
hammerjs: 'hammerjs/hammer.js'
}
},
plugins: [
Expand All @@ -27,6 +28,8 @@ module.exports = {
module: {
loaders: [{
test: require.resolve('d3'), loader: 'expose?d3'
}, {
test: require.resolve('hammerjs'), loader: 'expose?hammerjs'
}]
}
};
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@
"url": "https://github.com/OpenGeoscience/geojs"
},
"optionalDependencies": {
"d3": "^3.5.16"
"d3": "^3.5.16",
"hammerjs": "^2.0.8"
},
"devDependencies": {
"blanket": "~1.2",
Expand Down Expand Up @@ -71,6 +72,7 @@
"style-loader": "^0.13.1",
"stylus": "^0.54.5",
"stylus-loader": "^2.4.0",
"touch-emulator": "^1.0.0",
"url-loader": "^0.5.7",
"vgl": "0.3.10",
"webpack": "^1.12.14",
Expand Down
1 change: 1 addition & 0 deletions src/action.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ var geo_action = {
select: 'geo_action_select',
unzoomselect: 'geo_action_unzoomselect',
zoom: 'geo_action_zoom',
zoomrotate: 'geo_action_zoom_rotate',
zoomselect: 'geo_action_zoomselect',

// annotation actions
Expand Down
1 change: 1 addition & 0 deletions src/main.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

.geojs-map
position relative
user-select none

.geo-attribution
position absolute
Expand Down
Loading