Merge remote-tracking branch 'upstream/pull/5135'

[rails.git] / app / assets / javascripts / edit / id.js.erb

diff --git a/app/assets/javascripts/edit/id.js.erb b/app/assets/javascripts/edit/id.js.erb
index 3937f738172592a5fe00703069b5583c39b38fa1..90318788c72de8342527aaeb3ab7b944d0d86ecf 100644 (file)
--- a/app/assets/javascripts/edit/id.js.erb
+++ b/app/assets/javascripts/edit/id.js.erb
@@ -3,13 +3,14 @@
 $(document).ready(function () {
   var id = $("#id-embed");
 
 $(document).ready(function () {
   var id = $("#id-embed");
 

-  if (id.data("key")) {
-    var hashParams = OSM.params(location.hash.substring(1));
+  if (id.data("configured") === true) {
+    var hash = location.hash.substring(1);
+    var hashParams = hash ? OSM.params(hash) : {};

     var mapParams = OSM.mapParams();
     var params = {};
 
     if (mapParams.object) {
     var mapParams = OSM.mapParams();
     var params = {};
 
     if (mapParams.object) {

-      params.id = mapParams.object.type[0] + mapParams.object.id;
+      params.id = mapParams.object.type + '/' + mapParams.object.id;

       mapParams = OSM.parseHash(location.hash);
       if (mapParams.center) {
         params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;
       mapParams = OSM.parseHash(location.hash);
       if (mapParams.center) {
         params.map = mapParams.zoom + '/' + mapParams.center.lat + '/' + mapParams.center.lng;


@@ -33,6 +34,9 @@ $(document).ready(function () {
     if (hashParams.photo_username) params.photo_username = hashParams.photo_username;
     if (hashParams.presets) params.presets = hashParams.presets;
     if (hashParams.source) params.source = hashParams.source;
     if (hashParams.photo_username) params.photo_username = hashParams.photo_username;
     if (hashParams.presets) params.presets = hashParams.presets;
     if (hashParams.source) params.source = hashParams.source;

+    if (hashParams.validationDisable) params.validationDisable = hashParams.validationDisable;
+    if (hashParams.validationWarning) params.validationWarning = hashParams.validationWarning;
+    if (hashParams.validationError) params.validationError = hashParams.validationError;

     if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
 
     if (id.data("gpx")) {
     if (hashParams.walkthrough) params.walkthrough = hashParams.walkthrough;
 
     if (id.data("gpx")) {