diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-06-25 14:33:57 +0100 |
| commit | f9fe02f91ac72ea2954ee68a5f32d96a237fcd67 (patch) | |
| tree | f91d63ab3d6b9cd3555587090a541c870ecd3363 /web/js/map-OpenLayers.js | |
| parent | 67da8efc720d2d0bd22bd9fe8655b7e983b35bb4 (diff) | |
| parent | 45b3040884d7089e7d8c6f4acccd657b91c92a04 (diff) | |
Merge branch 'master' into fmb-read-only
Conflicts:
.gitignore
bin/make_css
perllib/FixMyStreet/Cobrand/FixMyStreet.pm
Diffstat (limited to 'web/js/map-OpenLayers.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 cf873edd6..eca1fc074 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -504,6 +504,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 |