Pass details of any selected object to remote editors

[rails.git] / app / assets / javascripts / index.js

diff --git a/app/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 43b7fefe0b4caddd7d4ec2f1d9cefcf143307a50..0f2971f2c9e6b26c6f1af9f86d861581badc5b66 100644 (file)
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -144,7 +144,7 @@ $(document).ready(function () {
   expiry.setYear(expiry.getFullYear() + 10);
 
   map.on('moveend layeradd layerremove', function() {
   expiry.setYear(expiry.getFullYear() + 10);
 
   map.on('moveend layeradd layerremove', function() {

-    updatelinks(
+    updateLinks(

       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),
       map.getCenter().wrap(),
       map.getZoom(),
       map.getLayersCode(),


@@ -197,14 +197,11 @@ $(document).ready(function () {
   });
 
   $("a[data-editor=remote]").click(function(e) {
   });
 
   $("a[data-editor=remote]").click(function(e) {

-      remoteEditHandler(map.getBounds());
-      e.preventDefault();
+    var params = OSM.mapParams(this.search);
+    remoteEditHandler(map.getBounds(), params.object);
+    e.preventDefault();

   });
 
   });
 

-  if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
-    remoteEditHandler(map.getBounds());
-  }
-

   if (OSM.params().edit_help) {
     $('#editanchor')
       .removeAttr('title')
   if (OSM.params().edit_help) {
     $('#editanchor')
       .removeAttr('title')


@@ -284,11 +281,27 @@ $(document).ready(function () {
     "/changeset/:id":              OSM.Browse(map, 'changeset')
   });
 
     "/changeset/:id":              OSM.Browse(map, 'changeset')
   });
 

+  if (OSM.preferred_editor == "remote" && document.location.pathname == "/edit") {
+    remoteEditHandler(map.getBounds(), params.object);
+    OSM.router.setCurrentPath("/");
+  }
+

   OSM.router.load();
 
   $(document).on("click", "a", function(e) {
   OSM.router.load();
 
   $(document).on("click", "a", function(e) {

-    if (e.isDefaultPrevented() || e.isPropagationStopped()) return;
-    if (this.host === window.location.host && OSM.router.route(this.pathname + this.search + this.hash)) e.preventDefault();
+    if (e.isDefaultPrevented() || e.isPropagationStopped())
+      return;
+
+    // Open links in a new tab as normal.
+    if (e.which > 1 || e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
+      return;
+
+    // Ignore cross-protocol and cross-origin links.
+    if (location.protocol !== this.protocol || location.host !== this.host)
+      return;
+
+    if (OSM.router.route(this.pathname + this.search + this.hash))
+      e.preventDefault();

   });
 
   $(".search_form").on("submit", function(e) {
   });
 
   $(".search_form").on("submit", function(e) {