cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Wrap index JS in a single $(document).ready()

Browse source
This commit is contained in:
John Firebaugh 2012-09-29 08:51:00 -07:00 • committed by Tom Hughes
parent 352f2a1671
commit c4d9f902d0
1 changed files with 30 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

32
app/assets/javascripts/index.js
View file

@ -1,9 +1,7 @@
var marker;
var map;
var params = OSM.mapParams();
function mapInit(){
map = createMap("map");
$(document).ready(function () {
var marker;
var params = OSM.mapParams();
var map = createMap("map");
if (!params.object_zoom) {
if (params.bbox) {
@ -42,9 +40,7 @@ function mapInit(){
updateLocation();
handleResize();
}
$(document).ready(function () {
$("#show_data").click(function (e) {
$.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
startBrowse(sidebarHtml);
@ -72,9 +68,8 @@ $(document).ready(function () {
return false;
});
});
function updateLocation() {
function updateLocation() {
var lonlat = unproj(map.getCenter());
var zoom = map.getZoom();
var layers = getMapLayers();
@ -85,9 +80,9 @@ function updateLocation() {
expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
}
}
function remoteEditHandler(event) {
function remoteEditHandler(event) {
var extent = unproj(map.getExtent());
var loaded = false;
@ -99,30 +94,23 @@ function remoteEditHandler(event) {
}, 1000);
return false;
}
}
function installEditHandler() {
$("a[data-editor=remote]").click(remoteEditHandler);
if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
remoteEditHandler();
}
}
$(document).ready(mapInit);
$(document).ready(installEditHandler);
$(document).ready(handleResize);
$(window).resize(function() {
$(window).resize(function() {
var centre = map.getCenter();
var zoom = map.getZoom();
handleResize();
map.setCenter(centre, zoom);
});
});
$(document).ready(function () {
$("#exportanchor").click(function (e) {
$.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
startExport(sidebarHtml);