cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make sure the hash updates properly on browse pages

Browse source 
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.
This commit is contained in:
Tom Hughes 2014-03-16 14:11:29 +00:00
parent faa77f7bcd
commit 4cad1970fb
3 changed files with 21 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/assets/javascripts/index.js
View file

@ -264,10 +264,11 @@ $(document).ready(function () {
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);
});
}
});
}

6
app/assets/javascripts/index/note.js.erb
View file

@ -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]+$/)) {
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});
});
}
}

20
app/assets/javascripts/router.js
View file

@ -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
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;
@ -156,12 +157,17 @@ OSM.Router = function(map, rts) {
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() {