aboutsummaryrefslogtreecommitdiffstats
path: root/web
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2020-02-14 09:22:32 +0000
committerMatthew Somerville <matthew@mysociety.org>2020-02-14 09:22:32 +0000
commitf661c0f41eb30b024c17888889b7d725ab412ddf (patch)
tree46b634121d0e060e66a32f48c72b43d332d5b986 /web
parentf5744500d82c8a3cf2a70ce0544d778579b1694a (diff)
parent014fc9b46e92e46a6884748004bf014fd479f400 (diff)
Merge branch 'missing-council-js'
Diffstat (limited to 'web')
-rw-r--r--web/cobrands/bexley/assets.js (renamed from web/cobrands/bexley/js.js)0
-rw-r--r--web/cobrands/fixmystreet-uk-councils/alloy.js2
-rw-r--r--web/cobrands/northamptonshire/assets.js4
-rw-r--r--web/cobrands/peterborough/assets.js (renamed from web/cobrands/peterborough/js.js)0
4 files changed, 3 insertions, 3 deletions
diff --git a/web/cobrands/bexley/js.js b/web/cobrands/bexley/assets.js
index a500ebbf3..a500ebbf3 100644
--- a/web/cobrands/bexley/js.js
+++ b/web/cobrands/bexley/assets.js
diff --git a/web/cobrands/fixmystreet-uk-councils/alloy.js b/web/cobrands/fixmystreet-uk-councils/alloy.js
index 27e43a4dd..77494f975 100644
--- a/web/cobrands/fixmystreet-uk-councils/alloy.js
+++ b/web/cobrands/fixmystreet-uk-councils/alloy.js
@@ -122,7 +122,7 @@ OpenLayers.Strategy.Alloy = OpenLayers.Class(OpenLayers.Strategy.FixMyStreet, {
});
-fixmystreet.assets.alloy_defaults = {
+fixmystreet.alloy_defaults = {
http_options: {
base: "https://alloy-api-tile01.yotta.co.uk/api/render-layer/tile/${layerid}/${environment}/${layerVersion}/${z}/${x}/${y}",
},
diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 67d75fb97..9f1e0750d 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -365,7 +365,7 @@ OpenLayers.Layer.NCCVectorAsset = OpenLayers.Class(OpenLayers.Layer.VectorAsset,
// default options for northants assets include
// a) checking for multiple assets in same location
// b) preventing submission unless an asset is selected
-var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, {
+var northants_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
class: OpenLayers.Layer.NCCVectorAsset,
protocol_class: OpenLayers.Protocol.Alloy,
http_options: {
@@ -442,7 +442,7 @@ $.each(layers, function(index, layer) {
// NCC roads layers which prevent report submission unless we have selected
// an asset.
-var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, {
+var northants_road_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
protocol_class: OpenLayers.Protocol.Alloy,
http_options: {
environment: is_live ? 26 : 28
diff --git a/web/cobrands/peterborough/js.js b/web/cobrands/peterborough/assets.js
index 47172712d..47172712d 100644
--- a/web/cobrands/peterborough/js.js
+++ b/web/cobrands/peterborough/assets.js