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

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

@ -1,9 +1,7 @@
var marker; $(document).ready(function () {
var map; var marker;
var params = OSM.mapParams(); var params = OSM.mapParams();
var map = createMap("map");
function mapInit(){
map = createMap("map");
if (!params.object_zoom) { if (!params.object_zoom) {
if (params.bbox) { if (params.bbox) {
@ -42,9 +40,7 @@ function mapInit(){
updateLocation(); updateLocation();
handleResize(); handleResize();
}
$(document).ready(function () {
$("#show_data").click(function (e) { $("#show_data").click(function (e) {
$.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) { $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
startBrowse(sidebarHtml); startBrowse(sidebarHtml);
@ -72,57 +68,49 @@ $(document).ready(function () {
return false; return false;
}); });
});
function updateLocation() { function updateLocation() {
var lonlat = unproj(map.getCenter()); var lonlat = unproj(map.getCenter());
var zoom = map.getZoom(); var zoom = map.getZoom();
var layers = getMapLayers(); var layers = getMapLayers();
var extents = unproj(map.getExtent()); var extents = unproj(map.getExtent());
var expiry = new Date(); var expiry = new Date();
updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id); updatelinks(lonlat.lon, lonlat.lat, zoom, layers, extents.left, extents.bottom, extents.right, extents.top, params.object_type, params.object_id);
expiry.setYear(expiry.getFullYear() + 10); expiry.setYear(expiry.getFullYear() + 10);
$.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry}); $.cookie("_osm_location", [lonlat.lon, lonlat.lat, zoom, layers].join("|"), {expires: expiry});
} }
function remoteEditHandler(event) { function remoteEditHandler(event) {
var extent = unproj(map.getExtent()); var extent = unproj(map.getExtent());
var loaded = false; var loaded = false;
$("#linkloader").load(function () { loaded = true; }); $("#linkloader").load(function () { loaded = true; });
$("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom); $("#linkloader").attr("src", "http://127.0.0.1:8111/load_and_zoom?left=" + extent.left + "&top=" + extent.top + "&right=" + extent.right + "&bottom=" + extent.bottom);
setTimeout(function () { setTimeout(function () {
if (!loaded) alert(I18n.t('site.index.remote_failed')); if (!loaded) alert(I18n.t('site.index.remote_failed'));
}, 1000); }, 1000);
return false; return false;
} }
function installEditHandler() {
$("a[data-editor=remote]").click(remoteEditHandler); $("a[data-editor=remote]").click(remoteEditHandler);
if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) { if (OSM.preferred_editor == "remote" && $('body').hasClass("site-edit")) {
remoteEditHandler(); remoteEditHandler();
} }
}
$(document).ready(mapInit); $(window).resize(function() {
$(document).ready(installEditHandler); var centre = map.getCenter();
$(document).ready(handleResize); var zoom = map.getZoom();
$(window).resize(function() { handleResize();
var centre = map.getCenter();
var zoom = map.getZoom();
handleResize(); map.setCenter(centre, zoom);
});
map.setCenter(centre, zoom);
});
$(document).ready(function () {
$("#exportanchor").click(function (e) { $("#exportanchor").click(function (e) {
$.ajax({ url: $(this).data('url'), success: function (sidebarHtml) { $.ajax({ url: $(this).data('url'), success: function (sidebarHtml) {
startExport(sidebarHtml); startExport(sidebarHtml);