diff options
| author | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-06-04 14:26:50 +0100 |
|---|---|---|
| committer | Matthew Somerville <matthew-github@dracos.co.uk> | 2019-06-05 17:54:31 +0100 |
| commit | cd16308e716935a03cebf78d019d7baf4d3127a4 (patch) | |
| tree | 330b3b1b4a22b9889732f44e294ea601180421e7 | |
| parent | ecb2e1af0788a24f216777ea9545abb26637cd96 (diff) | |
[Buckinghamshire] Move non-map JS to template.
| -rw-r--r-- | perllib/FixMyStreet/Map/Buckinghamshire.pm | 5 | ||||
| -rw-r--r-- | t/map/tests.t | 2 | ||||
| -rw-r--r-- | templates/web/buckinghamshire/footer_extra_js.html | 11 |
3 files changed, 12 insertions, 6 deletions
diff --git a/perllib/FixMyStreet/Map/Buckinghamshire.pm b/perllib/FixMyStreet/Map/Buckinghamshire.pm index d24077f70..e811eac50 100644 --- a/perllib/FixMyStreet/Map/Buckinghamshire.pm +++ b/perllib/FixMyStreet/Map/Buckinghamshire.pm @@ -37,14 +37,9 @@ sub copyright { sub map_javascript { [ '/vendor/OpenLayers/OpenLayers.wmts.js', - '/vendor/OpenLayers.Projection.OrdnanceSurvey.js', '/js/map-OpenLayers.js', '/js/map-wmts-base.js', '/js/map-wmts-buckinghamshire.js', - '/cobrands/fixmystreet/assets.js', - '/cobrands/fixmystreet-uk-councils/roadworks.js', - '/cobrands/buckinghamshire/js.js', - '/cobrands/buckinghamshire/assets.js', ] } 1; diff --git a/t/map/tests.t b/t/map/tests.t index 692cf6790..7e3b6f6bd 100644 --- a/t/map/tests.t +++ b/t/map/tests.t @@ -6,7 +6,7 @@ my $requires = { 'Bing' => 'map-bing-ol.js', 'Bristol' => 'bristol/assets.js', 'Bromley' => 'bromley/assets.js', - 'Buckinghamshire' => 'buckinghamshire/assets.js', + 'Buckinghamshire' => 'map-wmts-buckinghamshire.js', 'Lincolnshire' => 'lincolnshire/assets.js', 'FMS' => 'map-fms.js', 'Google' => 'map-google.js', diff --git a/templates/web/buckinghamshire/footer_extra_js.html b/templates/web/buckinghamshire/footer_extra_js.html index 8113befc9..6080f5e4f 100644 --- a/templates/web/buckinghamshire/footer_extra_js.html +++ b/templates/web/buckinghamshire/footer_extra_js.html @@ -1,3 +1,14 @@ [% scripts.push( version('/cobrands/fixmystreet-uk-councils/council_validation_rules.js'), ) %] +[%~ +IF bodyclass.match('mappage'); + scripts.push( + version('/vendor/OpenLayers.Projection.OrdnanceSurvey.js'), + version('/cobrands/fixmystreet/assets.js'), + version('/cobrands/fixmystreet-uk-councils/roadworks.js'), + version('/cobrands/buckinghamshire/js.js'), + version('/cobrands/buckinghamshire/assets.js'), + ); +END +%] |