Open
Conversation
Author
|
BTW, instead of merging this PR via github, I suggest adding my remote and fast-forwarding my |
Potlatch 1 has hard coded calls to updatelinks, so rename the updatelinks function to updateLinks and add an updatelinks function using the old style argument list for Potlatch 1 to call.
The default click handler in index.js handles them fine, and as this one was not calling preventDefault both were actually firing in some browsers, causing the changeset to be loaded twice and two history entries to be created.
The default click handler only handle the, not the rest of the entry, so retore the handler but add an e.preventDefault() call to stop the second handler running.
On Chrome, this lets clicks with modifier keys anywhere on the changeset entry work as expected. On other browsers, modifier keys still only work on the link itself.
Reenable them when returning to high zoom in the same session. Fixes openstreetmap#592
When invoking Potlatch on a node/way/relation object we should normally have valid location information in the map parameters, so use any zoom which is there if possible, otherwise fall back to an object type specific default value. Fixes openstreetmap#605.
Makes sure maximised content sits on top of the header.
(because I'll be lynched otherwise, mutter grumble)
Conflicts: app/views/layouts/_search.html.erb
…htsegments jsrouting: mouseover an instruction, highlight the route segment
…arch jsrouting: clear search boxes on page unload
(otherwise it fouls up the welcome message spacing)
(personally I am not feeling very Firefox-friendly right now)
MapQuest instructions still don't translate, as that backend doesn't accept simple language locals but require country codes as well.
…ncalc Fix hours:minutes duration display for routing
Minor fixes to the I18n code of routing
Using GraphHopper new API
Too close of a name collision to OSM.Router.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Resolved these conflicts:
app/controllers/geocoder_controller.rb
Some methods had been removed on master.
app/views/export/start.js.erb
This is moved to a plain .js file on master. The changes on your
branch don't appear necessary.
app/views/layouts/site.html.erb
Updated Routing tab markup to match current code.
app/views/site/_search.html.erb
This code now lives in index.js. I ported your changes over.
app/views/site/index.html.erb
The JS in this file was moved to index.js. I kept your additions,
but you should move them to index.js as well.
config/routes.rb
Spurious conflict.