Fix "where am I" on the edit page

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

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

+//= require bootstrap.tooltip

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


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