diff options
| author | Dave Arter <davea@mysociety.org> | 2018-01-18 17:05:34 +0000 |
|---|---|---|
| committer | Dave Arter <davea@mysociety.org> | 2018-02-08 14:26:16 +0000 |
| commit | 2049ab505a16bddd67ab3603806208c0ad564f7b (patch) | |
| tree | a7df3528b236349e1d4c214aa54a9d2ae5ec5161 /web/js/map-OpenLayers.js | |
| parent | b4992d7cffb71e003d726a09ed1606c4f289594f (diff) | |
Show loading spinner on map for assets as well as markers
Diffstat (limited to 'web/js/map-OpenLayers.js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index af62de34a..0f6cca2b5 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -568,6 +568,8 @@ $.extend(fixmystreet.utils, { fixmystreet.map.removePopup(fixmystreet.map.popups[0]); } }); + fixmystreet.markers.events.register( 'loadstart', null, fixmystreet.maps.loading_spinner.show); + fixmystreet.markers.events.register( 'loadend', null, fixmystreet.maps.loading_spinner.hide); var markers = fixmystreet.maps.markers_list( fixmystreet.pins, true ); fixmystreet.markers.addFeatures( markers ); @@ -877,7 +879,6 @@ OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, { use_page: false, read: function(options) { - fixmystreet.maps.loading_spinner.show(); // Pass the values of the category, status, and sort fields as query params options.params = options.params || {}; $.each({ filter_category: 'filter_categories', status: 'statuses', sort: 'sort' }, function(key, id) { @@ -905,7 +906,6 @@ OpenLayers.Protocol.FixMyStreet = OpenLayers.Class(OpenLayers.Protocol.HTTP, { /* Pan data handler */ OpenLayers.Format.FixMyStreet = OpenLayers.Class(OpenLayers.Format.JSON, { read: function(json, filter) { - fixmystreet.maps.loading_spinner.hide(); var obj; if (typeof json == 'string') { obj = OpenLayers.Format.JSON.prototype.read.apply(this, [json, filter]); |