Use prototype based event handling for consistency

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index 843d0d2debbe3e76e10e401f7b24a62709f5cea8..9d883daf90c6b0f84757c6a5150ed646c16d337c 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -270,25 +270,25 @@ end
     resizeMap();
   }
 
     resizeMap();
   }
 

-  function josmEditHandler() {
+  function josmEditHandler(event) {

     var extent = getMapExtent();
     var loaded = false;
 
     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);
 
     $("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() {
   }
 
   function installEditHandler() {

-    $("josmanchor").onclick =josmEditHandler;
+    $("josmanchor").observe("click", josmEditHandler);

 
     <% if preferred_editor == "josm" %>
 
     <% if preferred_editor == "josm" %>

-      $("editanchor").onclick =josmEditHandler;
+      $("editanchor").observe("click", josmEditHandler);

 
       <% if params[:action] == "edit" %>
         josmEditHandler();
 
       <% if params[:action] == "edit" %>
         josmEditHandler();


@@ -298,12 +298,9 @@ end
 
   mapInit();
 
 
   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' } %>
 
   <% if params['action'] == 'export' %>
   <%= remote_function :url => { :controller => 'export', :action => 'start' } %>