diff options
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | templates/web/base/main_nav.html | 5 | ||||
| -rw-r--r-- | web/cobrands/fixmystreet/fixmystreet.js | 3 | ||||
| -rw-r--r-- | web/js/map-OpenLayers.js | 5 |
4 files changed, 12 insertions, 7 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 77dcbba2e..bb2487801 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,9 +2,11 @@ * Unreleased - Front end improvements: - - Extra help text on contact form #2149 + - Extra help text on contact form #2149 - Bugfixes: - - Prevent contact form leaking information about updates #2149 + - Prevent contact form leaking information about updates #2149 + - Fix pointer event issue selecting pin on map. #2130 + - Fix admin navigation links in multi-language installs. * v2.3.2 (31st May 2018) - Front end improvements: diff --git a/templates/web/base/main_nav.html b/templates/web/base/main_nav.html index 9736697e3..189630902 100644 --- a/templates/web/base/main_nav.html +++ b/templates/web/base/main_nav.html @@ -1,7 +1,4 @@ [% - SET base = ""; - SET base = c.cobrand.base_url IF admin; - # DEFAULT would make sense here, except it treats the empty string as falsy # and some cobrands want to set ul_class to an empty string. SET ul_class="nav-menu nav-menu--main" UNLESS ul_class.defined; @@ -11,7 +8,7 @@ [%~ IF c.req.uri.path == uri AND NOT always_url ~%] <span [% attrs %]>[% label %]</span> [%~ ELSE ~%] - <a href="[% base %][% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a> + <a href="[% uri %][% suffix IF suffix %]" [% attrs %]>[% label %]</a> [%~ END ~%] </li> [%~ END %] diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js index 33bd5e812..1b0063f48 100644 --- a/web/cobrands/fixmystreet/fixmystreet.js +++ b/web/cobrands/fixmystreet/fixmystreet.js @@ -1145,6 +1145,9 @@ fixmystreet.display = { fixmystreet.maps.markers_resize(); // force a redraw so the selected marker gets bigger } + // We disabled this upon first touch to prevent it taking effect, re-enable now + fixmystreet.maps.click_control.activate(); + if (typeof callback === 'function') { callback(); } diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 2e62336ed..868e2333e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -311,6 +311,9 @@ $.extend(fixmystreet.utils, { return; } + // clickFeature operates on touchstart, we do not want the map click taking place on touchend! + fixmystreet.maps.click_control.deactivate(); + // All of this, just so that ctrl/cmd-click on a pin works?! var event; if (typeof window.MouseEvent === 'function') { @@ -720,7 +723,7 @@ $.extend(fixmystreet.utils, { } if (document.getElementById('mapForm')) { - var click = new OpenLayers.Control.Click(); + var click = fixmystreet.maps.click_control = new OpenLayers.Control.Click(); fixmystreet.map.addControl(click); click.activate(); } |