aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorThomas Haddad2017-03-15 18:11:49 +0100
committerThomas Haddad2017-03-15 18:12:30 +0100
commit203e40759843849611d39b87c9f24fc109fa72b4 (patch)
tree6b7fe3a7251250aa7e9e2da21632d057f086e500 /app/assets/javascripts
parentea8179d3831cefad8e9f02bee02933029317b1b8 (diff)
downloadchouette-core-203e40759843849611d39b87c9f24fc109fa72b4.tar.bz2
Refs #2819: Fix click on already selected stoparea inside olmap
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js14
1 files changed, 9 insertions, 5 deletions
diff --git a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
index 37ee76e65..f109921b7 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/components/OlMap.js
@@ -86,12 +86,16 @@ class OlMap extends Component{
feature.setStyle(defaultStyles);
centerLayer.setZIndex(0);
- if(e.selected[0].getGeometry() == feature.getGeometry()) {
- feature.setStyle(selectedStyles);
- centerLayer.setZIndex(2);
- }
-
if(e.selected.length != 0) {
+
+ if(e.selected[0].getGeometry() == feature.getGeometry()) {
+ if(e.selected[0].style_.image_.fill_.color_ != '#da2f36'){
+ feature.setStyle(selectedStyles);
+ centerLayer.setZIndex(2);
+ e.preventDefault()
+ return false
+ }
+ }
let data = Object.assign({}, e.selected[0].getProperties(), {geometry: undefined});
this.props.onSelectMarker(this.props.index, data)