X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0d3a9ed9cb47ce3b89ea9eaffbb589f9a9ff6d22..928465764e52407884b35e31a08bf9241e651269:/app/views/site/_potlatch.html.erb?ds=sidebyside

diff --git a/app/views/site/_potlatch.html.erb b/app/views/site/_potlatch.html.erb
index 2cdccc4b0..fedecbae8 100644
--- a/app/views/site/_potlatch.html.erb
+++ b/app/views/site/_potlatch.html.erb
@@ -1,56 +1,10 @@
+<%= javascript_include_tag "edit/potlatch" %>
+
 <div id="map">
-  <div id="potlatch"><%= raw t 'site.edit.flash_player_required' %></div>
+  <% session[:token] = current_user.tokens.create.token unless session[:token] && UserToken.find_by(:token => session[:token]) -%>
+  <% data = { :token => session[:token] } -%>
+  <% data[:lat] = @lat if @lat -%>
+  <% data[:lon] = @lon if @lon -%>
+  <% data[:zoom] = @zoom if @zoom -%>
+  <%= content_tag :div, t("site.edit.flash_player_required_html"), :id => "potlatch", :data => data %>
 </div>
-
-<%= javascript_include_tag 'swfobject.js' %>
-
-<% session[:token] = @user.tokens.create.token unless session[:token] and UserToken.find_by_token(session[:token]) %>
-
-<script type="text/javascript" defer="defer">
-  var changesaved=true;
-  var winie=false; if (document.all && window.print) { winie=true; }
-  
-  window.onbeforeunload=function() {
-    if (!changesaved) {
-      return '<%= escape_javascript(t('site.edit.potlatch_unsaved_changes')) %>';
-    }
-  }
-
-  function markChanged(a) { changesaved=a; }
-
-  function doSWF(lat,lon,sc) {
-    if (sc < 11) sc = 11;
-
-    var flashvars = {};
-    flashvars.winie = winie;
-    flashvars.scale = sc;
-    flashvars.token = '<%= session[:token] %>';
-    if (lat) { flashvars.lat = lat; }
-    if (lon) { flashvars.long = lon; }
-    <% if params['gpx']  %>flashvars.gpx = '<%= h(params['gpx']    ) %>';<% end %>
-    <% if params['way']  %>flashvars.way = '<%= h(params['way']    ) %>';<% end %>
-    <% if params['node'] %>flashvars.node = '<%= h(params['node']   ) %>';<% end %>
-    <% if params['tileurl'] %>flashvars.custombg = '<%= h(params['tileurl']) %>';<% end %>
-
-    var params = {};
-
-    var attributes = {};
-    attributes.id = "potlatch";
-    attributes.bgcolor = "#FFFFFF";
-
-    swfobject.embedSWF("<%= asset_path("/potlatch/potlatch.swf") %>", "potlatch", "100%", "100%", "6","<%= asset_path("expressInstall.swf") %>", flashvars, params, attributes);
-    // 700,600 for fixed size, 100%,100% for resizable
-  }
-
-  doSWF(<%= @lat || 'null' %>,<%= @lon || 'null' %>,<%= @zoom %>);
-
-  $(document).ready(function () {
-    $("body").on("click", "a.set_position", function () {
-      var lat = parseFloat($(this).attr("data-lat"));
-      var lon = parseFloat($(this).attr("data-lon"));
-      var zoom = parseInt($(this).attr("data-zoom"));
-
-      doSWF(lat, lon, zoom || 15);
-    });
-  });
-</script>