aboutsummaryrefslogtreecommitdiffstats
path: root/templates/web/base
diff options
context:
space:
mode:
Diffstat (limited to 'templates/web/base')
-rw-r--r--templates/web/base/maps/google.html5
-rw-r--r--templates/web/base/maps/openlayers.html5
2 files changed, 6 insertions, 4 deletions
diff --git a/templates/web/base/maps/google.html b/templates/web/base/maps/google.html
index 741edec40..0db6af7bf 100644
--- a/templates/web/base/maps/google.html
+++ b/templates/web/base/maps/google.html
@@ -14,7 +14,8 @@
[% map_html = BLOCK %]
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '[% page %]',
'area': [ [% map.area.join(',') %] ],
'all_pins': '[% all_pins %]',
@@ -27,7 +28,7 @@ var fixmystreet = {
'zoom': [% map.zoom %],
[%- END %]
'pins': [% INCLUDE maps/pins_js.html %]
-}
+});
</script>
<div id="map_box">
[% pre_map %]
diff --git a/templates/web/base/maps/openlayers.html b/templates/web/base/maps/openlayers.html
index 1e7ae5ce8..c00e28586 100644
--- a/templates/web/base/maps/openlayers.html
+++ b/templates/web/base/maps/openlayers.html
@@ -6,7 +6,8 @@
<input type="hidden" name="zoom" value="[% map.zoom %]">
<script type="text/javascript">
-var fixmystreet = {
+var fixmystreet = fixmystreet || {};
+$.extend(fixmystreet, {
'page': '[% page %]',
'area': [ [% map.area.join(',') %] ],
'all_pins': '[% all_pins %]',
@@ -26,7 +27,7 @@ var fixmystreet = {
'key': '[% c.config.BING_MAPS_API_KEY %]',
[%- END %]
'pins': [% INCLUDE maps/pins_js.html %]
-}
+});
</script>
<div id="map_box" aria-hidden="true">
[% pre_map %]