Merge branch 'supercool' of ssh://github.com/mysociety/fixmystreet into supercool

Conflicts:
	web/js/map-OpenLayers.js

Signed-off-by: Josh Angell <josh@supercooldesign.co.uk>

1 files changed, 5 insertions, 5 deletions

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 414bb1fc5..abee9ebfa 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -473,12 +473,12 @@ OpenLayers.Control.Click = OpenLayers.Class(OpenLayers.Control, {
                     $('html, body').animate({scrollTop:0}, 1000);
                 }else{
                     var height = $('#map_box').height();
-                    $('html, body').animate({scrollTop:height-60}, 1000);
+                    $('html, body').animate({scrollTop:height-60}, 1000, function(){
+                        //add this class so we can modify the look of the links inside
+                        $('#mob_sub_map_links').addClass('map_complete');
+                        $('#mob_ok').text('MAP');
+                    });
                 }
-
-                //add this class so we can modify the look of the links inside
-                $('#mob_sub_map_links').addClass('map_complete');
-                $('#mob_ok').text('MAP');
             });
         }