Make sure the hash updates properly on browse pages

Rework the way the move listener is disabled during initial
positiong of pages to avoid accidentally leaving it disabled
for the first user move of the map in some cases.

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index dc3c932773066ce56a518a9b1c921659cf5ee7e8..96e03539a08a4e245b3dafc51d5f094bc1bb75fb 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -264,10 +264,11 @@ $(document).ready(function () {
 
     function addObject(type, id, center) {
       var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {
 
     function addObject(type, id, center) {
       var bounds = map.addObject({type: type, id: parseInt(id)}, function(bounds) {

-        if (!window.location.hash && bounds.isValid()) {
-          OSM.router.moveListenerOff();
-          map.once('moveend', OSM.router.moveListenerOn);
-          if (center || !map.getBounds().contains(bounds)) map.fitBounds(bounds);
+        if (!window.location.hash && bounds.isValid() &&
+            (center || !map.getBounds().contains(bounds))) {
+          OSM.router.withoutMoveListener(function () {
+            map.fitBounds(bounds);
+          });

         }
       });
     }
         }
       });
     }

diff --git a/app/assets/javascripts/index/note.js.erb b/app/assets/javascripts/index/note.js.erb
index 18000deb05ab2ea4e963f8e7e3b1a9e6ff9db953..2c9e42210008bf6b1653d5d530233d114090e51e 100644 (file)
--- a/app/assets/javascripts/index/note.js.erb
+++ b/app/assets/javascripts/index/note.js.erb
@@ -101,9 +101,9 @@ OSM.Note = function (map) {
       latLng = L.latLng(data.coordinates.split(','));
 
     if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {
       latLng = L.latLng(data.coordinates.split(','));
 
     if (!window.location.hash || window.location.hash.match(/^#?c[0-9]+$/)) {

-      OSM.router.moveListenerOff();
-      map.once('moveend', OSM.router.moveListenerOn);
-      map.setView(latLng, 15, {reset: true});
+      OSM.router.withoutMoveListener(function () {
+        map.setView(latLng, 15, {reset: true});
+      });

     }
   }
 
     }
   }
 

diff --git a/app/assets/javascripts/router.js b/app/assets/javascripts/router.js
index ab206410703e81a4db32cecf914551d539b9e535..9af70c21d5e714d4ee9384c5d6e48a170b662e08 100644 (file)
--- a/app/assets/javascripts/router.js
+++ b/app/assets/javascripts/router.js
@@ -42,8 +42,9 @@
    OSM.Router also handles updating the hash portion of the URL containing transient
    map state such as the position and zoom level. Some route controllers may wish to
    temporarily suppress updating the hash (for example, to omit the hash on pages
    OSM.Router also handles updating the hash portion of the URL containing transient
    map state such as the position and zoom level. Some route controllers may wish to
    temporarily suppress updating the hash (for example, to omit the hash on pages

-   such as `/way/1234` unless the map is moved). This can be done by calling
-   `OSM.router.moveListenerOff` and `OSM.router.moveListenerOn`.
+   such as `/way/1234` unless the map is moved). This can be done by using
+   `OSM.router.withoutMoveListener` to run a block of code that may update
+   move the map without the hash changing.

  */
 OSM.Router = function(map, rts) {
   var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;
  */
 OSM.Router = function(map, rts) {
   var escapeRegExp  = /[\-{}\[\]+?.,\\\^$|#\s]/g;


@@ -156,12 +157,17 @@ OSM.Router = function(map, rts) {
     router.stateChange(state, hash);
   };
 
     router.stateChange(state, hash);
   };
 

-  router.moveListenerOn = function() {
-    map.on('moveend', router.updateHash);
-  };
+  router.withoutMoveListener = function (callback) {
+    function disableMoveListener() {
+      map.off('moveend', router.updateHash);
+      map.once('moveend', function () {
+        map.on('moveend', router.updateHash);
+      });
+    }

 
 

-  router.moveListenerOff = function() {
-    map.off('moveend', router.updateHash);
+    map.once('movestart', disableMoveListener);
+    callback();
+    map.off('movestart', disableMoveListener);

   };
 
   router.load = function() {
   };
 
   router.load = function() {