From 7e3ca66fffec0b44efe676760650994b719609e1 Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Sat, 29 Sep 2012 14:49:16 -0700 Subject: [PATCH] Use $(document).ready() to initialise browse JS --- app/assets/javascripts/browse.js | 42 +++++++++++++++----------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/app/assets/javascripts/browse.js b/app/assets/javascripts/browse.js index 424940130..1db89ad0a 100644 --- a/app/assets/javascripts/browse.js +++ b/app/assets/javascripts/browse.js @@ -1,26 +1,26 @@ -function remoteEditHandler(event, bbox, select) { - var left = bbox.left - 0.0001; - var top = bbox.top + 0.0001; - var right = bbox.right + 0.0001; - var bottom = bbox.bottom - 0.0001; - var loaded = false; +$(document).ready(function () { + function remoteEditHandler(event, bbox, select) { + var left = bbox.left - 0.0001; + var top = bbox.top + 0.0001; + var right = bbox.right + 0.0001; + var bottom = bbox.bottom - 0.0001; + var loaded = false; + + $("#linkloader").load(function () { loaded = true; }); + + if (select) { + $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select); + } else { + $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom); + } - $("#linkloader").load(function () { loaded = true; }); + setTimeout(function () { + if (!loaded) alert(I18n.t('site.index.remote_failed')); + }, 1000); - if (select) { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom + "&select=" + select); - } else { - $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + left + "&top=" + top + "&right=" + right + "&bottom=" + bottom); + return false; } - setTimeout(function () { - if (!loaded) alert(I18n.t('site.index.remote_failed')); - }, 1000); - - return false; -} - -function init() { var map = createMap("small_map", { controls: [ new OpenLayers.Control.Navigation() ] }); @@ -83,6 +83,4 @@ function init() { createMenu("area_edit", "area_edit_menu", "right"); createMenu("object_edit", "object_edit_menu", "right"); -} - -window.onload = init; +}); -- 2.43.2