Merge remote-tracking branch 'osmlab/map-ui'

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 256ab8e481295c4c36f49699271830a17767aa02..225ddaf44503ee78aaa2ec81455121df795c6e36 100644 (file)
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -2,7 +2,9 @@
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery.cookie
 //= require jquery_ujs
 //= require jquery.timers
 //= require jquery.cookie

+//= require jquery.throttle-debounce

 //= require augment
 //= require augment

+//= require osm

 //= require leaflet
 //= require leaflet.osm
 //= require leaflet.hash
 //= require leaflet
 //= require leaflet.osm
 //= require leaflet.hash


@@ -11,7 +13,6 @@
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth
 //= require leaflet.locationfilter
 //= require i18n/translations
 //= require oauth

-//= require osm

 //= require piwik
 //= require map
 //= require menu
 //= require piwik
 //= require map
 //= require menu


@@ -43,12 +44,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;


@@ -60,17 +70,27 @@ function remoteEditHandler(bbox, select) {
  */
 function updatelinks(loc, zoom, layers, bounds, object) {
   $(".geolink").each(function(index, link) {
  */
 function updatelinks(loc, zoom, layers, bounds, object) {
   $(".geolink").each(function(index, link) {

-    var base = link.href.split('?')[0],
+    var href = link.href.split(/[?#]/)[0],

         args = querystring.parse(link.search.substring(1));
 
     if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();
         args = querystring.parse(link.search.substring(1));
 
     if (bounds && $(link).hasClass("bbox")) args.bbox = normalBounds(bounds).toBBoxString();

-    if (layers && $(link).hasClass("layers")) args.layers = layers;

     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 
     if (object && $(link).hasClass("object")) args[object.type] = object.id;
 

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

 
     if ($(link).hasClass("llz")) {
 
     if ($(link).hasClass("llz")) {

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

     }
 
     link.href = href;
     }
 
     link.href = href;


@@ -102,6 +122,19 @@ function cookieContent(map) {
   return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
 }
 
   return [center.lng, center.lat, map.getZoom(), map.getLayersCode()].join('|');
 }
 

+function escapeHTML(string) {
+  var htmlEscapes = {
+    '&': '&amp;',
+    '<': '&lt;',
+    '>': '&gt;',
+    '"': '&quot;',
+    "'": '&#x27;'
+  };
+  return string == null ? '' : (string + '').replace(/[&<>"']/g, function(match) {
+      return htmlEscapes[match];
+  });
+}
+

 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct
 /*
  * Forms which have been cached by rails may have the wrong
  * authenticity token, so patch up any forms with the correct