Ensure object parameter is removed from edit link when closing sidebar

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cbea58cc17628bc6f4daf90c432c635f8546df67..6a4fdf6ab60dabf3f6d9730749b5447fc700f91d 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -3,22 +3,19 @@
 //= require jquery.timers
 //= require jquery.cookie
 //= require jquery.throttle-debounce
 //= require jquery.timers
 //= require jquery.cookie
 //= require jquery.throttle-debounce

+//= require bootstrap.tooltip
+//= require bootstrap.dropdown

 //= require augment
 //= require osm
 //= require leaflet
 //= require leaflet.osm
 //= require augment
 //= require osm
 //= require leaflet
 //= require leaflet.osm

-//= require leaflet.hash
+//= require leaflet.map

 //= require leaflet.zoom
 //= require leaflet.zoom

-//= require leaflet.extend

 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require piwik

-//= require map
-//= require menu
-//= require sidebar

 //= require richtext
 //= require richtext

-//= require geocoder

 //= require querystring
 
 var querystring = require('querystring-component');
 //= require querystring
 
 var querystring = require('querystring-component');


@@ -27,13 +24,6 @@ function zoomPrecision(zoom) {
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 
     return Math.max(0, Math.ceil(Math.log(zoom) / Math.LN2));
 }
 

-function normalBounds(bounds) {
-    if (bounds instanceof L.LatLngBounds) return bounds;
-    return new L.LatLngBounds(
-        new L.LatLng(bounds[0][0], bounds[0][1]),
-        new L.LatLng(bounds[1][0], bounds[1][1]));
-}
-

 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {
 function remoteEditHandler(bbox, select) {
   var loaded = false,
       query = {


@@ -44,12 +34,21 @@ function remoteEditHandler(bbox, select) {
       };
 
   if (select) query.select = select;
       };
 
   if (select) query.select = select;

-  $("#linkloader")
+
+  var iframe = $('<iframe>')
+    .hide()
+    .appendTo('body')

     .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))
     .attr("src", "http://127.0.0.1:8111/load_and_zoom?" + querystring.stringify(query))

-    .load(function() { loaded = true; });
+    .on('load', function() {
+      $(this).remove();
+      loaded = true;
+    });

 
   setTimeout(function () {
 
   setTimeout(function () {

-    if (!loaded) alert(I18n.t('site.index.remote_failed'));
+    if (!loaded) {
+      alert(I18n.t('site.index.remote_failed'));
+      iframe.remove();
+    }

   }, 1000);
 
   return false;
   }, 1000);
 
   return false;


@@ -59,52 +58,47 @@ function remoteEditHandler(bbox, select) {
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */
  * Called as the user scrolls/zooms around to maniplate hrefs of the
  * view tab and various other links
  */

-function updatelinks(loc, zoom, layers, bounds, object) {
+function updateLinks(loc, zoom, layers, object) {

   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],
   $(".geolink").each(function(index, link) {
     var href = link.href.split(/[?#]/)[0],

-        args = querystring.parse(link.search.substring(1));
+      args = querystring.parse(link.search.substring(1)),
+      editlink = $(link).hasClass("editlink");
+
+    delete args['node'];
+    delete args['way'];
+    delete args['relation'];
+    delete args['changeset'];

 
 

-    if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();
-    if (object && $(link).hasClass("object")) args[object.type] = object.id;
+    if (object && editlink) {
+      args[object.type] = object.id;
+    }

 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 
 
     var query = querystring.stringify(args);
     if (query) href += '?' + query;
 

-    if ($(link).hasClass("llz")) {
-      args = {
-        lat: loc.lat,
-        lon: loc.lon || loc.lng,
-        zoom: zoom
-      };
-
-      if (layers && $(link).hasClass("layers")) {
-        args.layers = layers;
-      }
+    args = {
+      lat: loc.lat,
+      lon: loc.lon || loc.lng,
+      zoom: zoom
+    };

 
 

-      href += OSM.formatHash(args);
+    if (layers && !editlink) {
+      args.layers = layers;

     }
 
     }
 

-    link.href = href;
+    href += OSM.formatHash(args);

 
 

-    var minzoom = $(link).data("minzoom");
-    if (minzoom) {
-      var name = link.id.replace(/anchor$/, "");
-      $(link).off("click.minzoom");
-      if (zoom >= minzoom) {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_tooltip"))
-          .removeClass("disabled");
-      } else {
-        $(link)
-          .attr("title", I18n.t("javascripts.site." + name + "_disabled_tooltip"))
-          .addClass("disabled")
-          .on("click.minzoom", function () {
-            alert(I18n.t("javascripts.site." + name + "_zoom_alert"));
-            return false;
-          });
-      }
-    }
+    link.href = href;

   });
   });

+
+  var editDisabled = zoom < 13;
+  $('#edit_tab')
+    .tooltip({placement: 'bottom'})
+    .off('click.minzoom')
+    .on('click.minzoom', function() { return !editDisabled; })
+    .toggleClass('disabled', editDisabled)
+    .attr('data-original-title', editDisabled ?
+      I18n.t('javascripts.site.edit_disabled_tooltip') : '');

 }
 
 // generate a cookie-safe string of map state
 }
 
 // generate a cookie-safe string of map state


@@ -113,12 +107,34 @@ function cookieContent(map) {
   return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
 }
 
   return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
 }
 

-/*
- * Forms which have been cached by rails may have the wrong
- * authenticity token, so patch up any forms with the correct
- * token taken from the page header.
- */
+function escapeHTML(string) {
+  var htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;'
+  };
+  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+      return htmlEscapes[match];
+  });
+}
+
+function maximiseMap() {
+  $("#content").addClass("maximised");
+}
+
+function minimiseMap() {
+  $("#content").removeClass("maximised");
+}
+

 $(document).ready(function () {
 $(document).ready(function () {

-  var auth_token = $("meta[name=csrf-token]").attr("content");
-  $("form input[name=authenticity_token]").val(auth_token);
+  $("#menu-icon").on("click", function(e) {
+    e.preventDefault();
+    $("header").toggleClass("closed");
+  });
+
+  $("nav.primary li a").on("click", function() {
+    $("header").toggleClass("closed");
+  });

 });
 });