diff options
Diffstat (limited to 'web')
| -rw-r--r-- | web/cobrands/sass/_base.scss | 10 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 6 |
2 files changed, 15 insertions, 1 deletions
diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 4e2a2fd5f..d3e96fb5f 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1649,6 +1649,16 @@ html.js #map .noscript { bottom: 3px !important; #{$right}: 3px; } +.olControlDragFeatureFMSOver { + cursor: move; + cursor: -webkit-grab; + cursor: grab; +} +.olControlDragFeatureFMSActive.olControlDragFeatureFMSOver.olDragDown { + cursor: move; + cursor: -webkit-grabbing; + cursor: grabbing; +} /* Drag is only present in noscript form. XXX Copy from core. */ #drag { diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 0a1c947a0..7d0f9076e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -96,6 +96,7 @@ $.extend(fixmystreet.utils, { fixmystreet.markers.features[0].move(lonlat); } else { var markers = fixmystreet.maps.markers_list( [ [ lonlat.lat, lonlat.lon, fixmystreet.pin_new_report_colour ] ], false ); + fixmystreet.bbox_strategy.layer.protocol.abort(fixmystreet.bbox_strategy.response); fixmystreet.bbox_strategy.deactivate(); fixmystreet.markers.removeAllFeatures(); fixmystreet.markers.addFeatures( markers ); @@ -125,7 +126,7 @@ $.extend(fixmystreet.utils, { fixmystreet.map.getProjectionObject() ); } - var id = +pin[3]; + var id = pin[3] === undefined ? pin[3] : +pin[3]; var marker_size = (id === window.selected_problem_id) ? selected_size : size; var marker = new OpenLayers.Feature.Vector(loc, { colour: pin[2], @@ -578,6 +579,9 @@ $.extend(fixmystreet.utils, { }); fixmystreet.markers.events.register( 'loadstart', null, fixmystreet.maps.loading_spinner.show); fixmystreet.markers.events.register( 'loadend', null, fixmystreet.maps.loading_spinner.hide); + OpenLayers.Request.XMLHttpRequest.onabort = function() { + fixmystreet.markers.events.triggerEvent("loadend", {response: null}); + }; var markers = fixmystreet.maps.markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); |