diff options
-rw-r--r-- | .cypress/cypress/integration/regressions.js | 5 | ||||
-rw-r--r-- | CHANGELOG.md | 1 | ||||
-rw-r--r-- | web/cobrands/sass/_base.scss | 10 | ||||
-rw-r--r-- | web/js/map-OpenLayers.js | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/.cypress/cypress/integration/regressions.js b/.cypress/cypress/integration/regressions.js index 209013339..c54bc8e9f 100644 --- a/.cypress/cypress/integration/regressions.js +++ b/.cypress/cypress/integration/regressions.js @@ -14,6 +14,11 @@ describe('Regression tests', function() { cy.get('#sub_map_links').should('be.visible'); cy.cleanUpXHR(); }); + it('Does not fade on new pin hover', function() { + cy.visit('/around?pc=BS10+5EE&js=1'); + cy.get('#map_box').click(200, 200); + cy.get('#map_box image').last().trigger('mousemove').should('have.css', 'opacity', '1'); + }); it('Does not hide the new report pin even if you click really quick', function() { cy.visit('/around?pc=BS10+5EE&js=1'); cy.get('#map_box').click(200, 200); diff --git a/CHANGELOG.md b/CHANGELOG.md index 90a77b7cf..ee2fb3fb1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ - Add default placeholder to report extra fields. #2027 - Clicking the "Click map" instruction banner now begins a new report #2033 - Homepage postcode input is now marked up as a required input #2037 + - Improved cursor/display of the new report pin. #2038 - Bugfixes: - Stop asset layers obscuring marker layer. #1999 - Don't delete hidden field values when inspecting reports. #1999 diff --git a/web/cobrands/sass/_base.scss b/web/cobrands/sass/_base.scss index 4e2a2fd5f..d3e96fb5f 100644 --- a/web/cobrands/sass/_base.scss +++ b/web/cobrands/sass/_base.scss @@ -1649,6 +1649,16 @@ html.js #map .noscript { bottom: 3px !important; #{$right}: 3px; } +.olControlDragFeatureFMSOver { + cursor: move; + cursor: -webkit-grab; + cursor: grab; +} +.olControlDragFeatureFMSActive.olControlDragFeatureFMSOver.olDragDown { + cursor: move; + cursor: -webkit-grabbing; + cursor: grabbing; +} /* Drag is only present in noscript form. XXX Copy from core. */ #drag { diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js index ec4f8bc3d..7d0f9076e 100644 --- a/web/js/map-OpenLayers.js +++ b/web/js/map-OpenLayers.js @@ -126,7 +126,7 @@ $.extend(fixmystreet.utils, { fixmystreet.map.getProjectionObject() ); } - var id = +pin[3]; + var id = pin[3] === undefined ? pin[3] : +pin[3]; var marker_size = (id === window.selected_problem_id) ? selected_size : size; var marker = new OpenLayers.Feature.Vector(loc, { colour: pin[2], |