X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/46af060a3708c2d213e550a2d7482cdf56a92e9c..38e152d784fe0577b07d6f542b44a8d1f5c84371:/app/views/site/index.html.erb?ds=sidebyside diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index 843d0d2de..9d883daf9 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -270,25 +270,25 @@ end resizeMap(); } - function josmEditHandler() { + function josmEditHandler(event) { var extent = getMapExtent(); var loaded = false; - $("linkloader").onload = function () { loaded = true; }; + $("linkloader").observe("load", function () { loaded = true; }); $("linkloader").src = "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom; setTimeout(function () { if (!loaded) alert("<%= t('site.index.josm_failed') %>"); }, 1000); - return false; + event.stop(); } function installEditHandler() { - $("josmanchor").onclick =josmEditHandler; + $("josmanchor").observe("click", josmEditHandler); <% if preferred_editor == "josm" %> - $("editanchor").onclick =josmEditHandler; + $("editanchor").observe("click", josmEditHandler); <% if params[:action] == "edit" %> josmEditHandler(); @@ -298,12 +298,9 @@ end mapInit(); - window.onload = handleResize; - window.onresize = handleResize; - - Event.observe(window, 'load', installEditHandler); - Event.observe(window, 'load', handleResize); - Event.observe(window, 'resize', handleResize); + Event.observe(window, "load", installEditHandler); + Event.observe(window, "load", handleResize); + Event.observe(window, "resize", handleResize); <% if params['action'] == 'export' %> <%= remote_function :url => { :controller => 'export', :action => 'start' } %>