From 98445b2ab9d9d7b731ba128e7878a865d2409f37 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Sat, 30 Jun 2012 14:57:18 +0100 Subject: [PATCH] Replace use of Event with jQuery methods Versions of OpenLayers before 2.12 provided a global Event object but this has now been removed, so use jQuery methods instead. --- app/views/changeset/_map.html.erb | 6 ++---- app/views/site/index.html.erb | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/app/views/changeset/_map.html.erb b/app/views/changeset/_map.html.erb index 88dd53c99..a490ad1d8 100644 --- a/app/views/changeset/_map.html.erb +++ b/app/views/changeset/_map.html.erb @@ -37,7 +37,7 @@ $("#tr-changeset-" + id).removeClass("selected"); } - function init() { + $(document).ready(function () { var map = createMap("changeset_list_map", { controls: [ new OpenLayers.Control.Navigation(), @@ -84,7 +84,5 @@ <% else %> map.zoomToExtent(proj(bounds)); <% end %> - } - - Event.observe(window, "load", init); + }); diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb index a74c7b356..b7a9df068 100644 --- a/app/views/site/index.html.erb +++ b/app/views/site/index.html.erb @@ -288,7 +288,7 @@ end $(document).ready(function () { $("#exportanchor").click(function (e) { $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" }); - Event.stop(e); + e.preventDefault(); }); <% if params[:action] == 'export' -%> -- 2.43.2