From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 5 Aug 2013 23:30:45 +0000 (-0700)
Subject: Create linkloader iframe in script
X-Git-Tag: live~4814
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/d4135390acff291f2f2c15d9fb86723ebf4fe755

Create linkloader iframe in script
---

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index cbea58cc1..b257f7fed 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -44,12 +44,21 @@ function remoteEditHandler(bbox, 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))
-    .load(function() { loaded = true; });
+    .on('load', function() {
+      $(this).remove();
+      loaded = true;
+    });
 
   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;
diff --git a/app/views/browse/_map.html.erb b/app/views/browse/_map.html.erb
index ed3cc0faf..9b82753fb 100644
--- a/app/views/browse/_map.html.erb
+++ b/app/views/browse/_map.html.erb
@@ -1,6 +1,3 @@
-<iframe id="linkloader" style="display: none">
-</iframe>
-
 <div id="browse_map" class='clearfix content_map'>
   <% if map.instance_of? Changeset or (map.instance_of? Node and map.version > 1) or map.visible? %>
 
diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 721fd18ed..73e1382d3 100644
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -19,9 +19,6 @@
 <div id="map" tabindex="2">
 </div>
 
-<iframe id="linkloader" style="display: none">
-</iframe>
-
 <div id="attribution">
   <table width="100%">
     <tr>