diff options
| author | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
|---|---|---|
| committer | Struan Donald <struan@exo.org.uk> | 2012-06-08 12:27:06 +0100 |
| commit | 66630c094ba7fbb1d05c85de638ae77a8ad8e043 (patch) | |
| tree | 3331bdcfb76e8b0cbe33d2a38045d87232f7ac9d /web/js | |
| parent | aabfdd765ea0217c12307a1effa3852c00eac6a4 (diff) | |
| parent | aa59f68fcb9b26673662033c4c2d72835420ab4a (diff) | |
Merge branch 'barnet-newstyle'
Conflicts:
.gitignore
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
perllib/FixMyStreet/Cobrand/UKCouncils.pm
templates/web/default/reports/council.html
templates/web/fixmystreet/header.html
templates/web/fixmystreet/report/display.html
web/cobrands/bromley/layout.scss
web/cobrands/fixmystreet/fixmystreet.js
web/js/map-OpenLayers.js
Diffstat (limited to 'web/js')
| -rw-r--r-- | web/js/map-OpenLayers.js | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index 39e6275ff..d98994d84 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -499,6 +499,8 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, { // e.xy is relative to top left of map, which might not be top left of page e.xy.x += bo.left; e.xy.y += bo.top; + + // 24 and 64 is the width and height of the marker pin if (e.xy.y <= o.top || (e.xy.x >= o.left && e.xy.x <= o.left + w + 24 && e.xy.y >= o.top && e.xy.y <= o.top + h + 64)) { // top of the page, pin hidden by header; // or underneath where the new sidebar will appear |