From 733e9b454e6fc016a36874f81392bdf7c2017f9a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Antoine=20Beaupr=C3=A9?= <anarcat@koumbit.org>
Date: Sat, 3 Mar 2012 15:38:01 -0500
Subject: [PATCH] properly link to javascript underlay
---
IkiWiki/Plugin/osm.pm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/IkiWiki/Plugin/osm.pm b/IkiWiki/Plugin/osm.pm
index e85d4be62..d8db01dbb 100644
--- a/IkiWiki/Plugin/osm.pm
+++ b/IkiWiki/Plugin/osm.pm
@@ -529,7 +529,7 @@ sub include_javascript ($) {
}
}
if ($loader) {
- return embed_map_code() . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
+ return embed_map_code($page) . "<script type=\"text/javascript\" charset=\"utf-8\">$loader</script>";
}
else {
return '';
@@ -553,16 +553,17 @@ sub cgi($) {
print ("\r\n");
print "<html><body>";
print "<div id=\"mapdiv-$map\"></div>";
- print embed_map_code($map);
+ print embed_map_code();
print "<script type=\"text/javascript\" charset=\"utf-8\">mapsetup( 'mapdiv-$map', { 'map': '$map', 'lat': urlParams['lat'], 'lon': urlParams['lon'], 'zoom': urlParams['zoom'], 'fullscreen': 1, 'editable': 1, 'format': '" . prefered_format() . "'});</script>";
print "</body></html>";
exit 0;
}
-sub embed_map_code() {
+sub embed_map_code(;$) {
+ my $page=shift;
return '<script src="http://www.openlayers.org/api/OpenLayers.js" type="text/javascript" charset="utf-8"></script>'.
- '<script src="'.urlto("ikiwiki/osm.js", $from).
+ '<script src="'.urlto("ikiwiki/osm.js", $page).
'" type="text/javascript" charset="utf-8"></script>'."\n";
}
--
2.39.5