From: Tom Hughes <tom@compton.nu>
Date: Tue, 6 Aug 2013 08:05:59 +0000 (+0100)
Subject: Merge remote-tracking branch 'osmlab/map-ui'
X-Git-Tag: live~5939
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/feeb135760abdbfef0eea193318566d9d96f2523?hp=34e251c225c7903b64f1fda2b594dd1c70aeeb93

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

diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index fc7cdb51c..225ddaf44 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/assets/javascripts/index.js b/app/assets/javascripts/index.js
index 4724351ce..bae80cac5 100644
--- a/app/assets/javascripts/index.js
+++ b/app/assets/javascripts/index.js
@@ -185,7 +185,7 @@ function setPositionLink(map) {
       }
 
       if (data.type && data.id) {
-        map.addObject(data, { zoom: true, style: { opacity: 0.2, fill: false } });
+        map.addObject(data, { zoom: false, style: { opacity: 0.2, fill: false } });
       }
 
       map.markerLayer.clearLayers();
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>
diff --git a/test/functional/oauth_controller_test.rb b/test/functional/oauth_controller_test.rb
index b34416be6..d0ac28d0a 100644
--- a/test/functional/oauth_controller_test.rb
+++ b/test/functional/oauth_controller_test.rb
@@ -5,27 +5,27 @@ class OauthControllerTest < ActionController::TestCase
   # test all routes which lead to this controller
   def test_routes
     assert_routing(
-      { :path => "/oauth/revoke" },
+      { :path => "/oauth/revoke", :method => :post },
       { :controller => "oauth", :action => "revoke" }
     )
     assert_routing(
-      { :path => "/oauth/authorize" },
+      { :path => "/oauth/authorize", :method => :post },
       { :controller => "oauth", :action => "authorize" }
     )
     assert_routing(
-      { :path => "/oauth/token" },
+      { :path => "/oauth/token", :method => :get },
       { :controller => "oauth", :action => "token" }
     )
     assert_routing(
-      { :path => "/oauth/request_token" },
+      { :path => "/oauth/request_token", :method => :get },
       { :controller => "oauth", :action => "request_token" }
     )
     assert_routing(
-      { :path => "/oauth/access_token" },
+      { :path => "/oauth/access_token", :method => :get },
       { :controller => "oauth", :action => "access_token" }
     )
     assert_routing(
-      { :path => "/oauth/test_request" },
+      { :path => "/oauth/test_request", :method => :get },
       { :controller => "oauth", :action => "test_request" }
     )
   end