From: philipp <philipp@7aebc617-e5e2-0310-91dc-80fb5f6d2477>
Date: Wed, 18 Sep 2013 19:50:53 +0000 (+0000)
Subject: XML entities like &amp; are now decoded correctly by omitting the <script> element... 
X-Git-Url: https://git.toastfreeware.priv.at/philipp/winterrodeln/mediawiki_extensions/wrmap.git/commitdiff_plain/64f4b4baa7a05adc7ce741f7773c3f036df07c62

XML entities like &amp; are now decoded correctly by omitting the <script> element inside the map's <div>.


git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1598 7aebc617-e5e2-0310-91dc-80fb5f6d2477
---

diff --git a/wrmap.body.php b/wrmap.body.php
index 753d5cd..8bb75f1 100644
--- a/wrmap.body.php
+++ b/wrmap.body.php
@@ -180,9 +180,7 @@ class WrBaseMap {
 		$width_s = (isset($properties['width'])) ? (string) $properties['width'] . 'px' : '100%';
 		$height_s = (isset($properties['height']) ? (string) $properties['height'] : 450) . 'px';
 		$output = "<div class=\"wrmap\" style=\"width: $width_s; height: $height_s; border-style:none;\" data-img-path=\"$wgExtensionAssetsPath/wrmap/openlayers/img/\">";
-		$output .= "<script type=\"application/json\">";
 		$output .= htmlspecialchars($json_string, ENT_NOQUOTES);
-		$output .= "</script>";
 		$output .= "</div>\n";
 		
 		return $output;
diff --git a/wrmap.js b/wrmap.js
index 76c69da..2bfc787 100644
--- a/wrmap.js
+++ b/wrmap.js
@@ -2,11 +2,9 @@
 
 function init_wrmap(i, jq_map) {
 	jq_map = $(jq_map);
-	var jq_map_script = jq_map.children();
 	OpenLayers.ImgPath = jq_map.attr('data-img-path'); // e.g. "/mediawiki/extensions/wrmap/openlayers/img/"
-	var json_string = jq_map_script.text();
-	jq_map_script.detach();
-
+	var json_string = jq_map.text();
+	jq_map.empty(); // once parsed, remove geojson string from the map element.
 	
 	// extract, tranform and split features to layers
 	var EPSG4326 = new OpenLayers.Projection("EPSG:4326"); // lon/lat 
diff --git a/wrmap.php b/wrmap.php
index 7cf4e01..f759922 100644
--- a/wrmap.php
+++ b/wrmap.php
@@ -143,8 +143,8 @@ Definition
 		coordinates.
 
 
-For transmitting the map to javascript, geojson is used in a <script> block. This way,
-an extra request is avoided. The geojson format used here consists of a single 
+For transmitting the map to javascript, geojson is used in the <div> element of the map.
+This way, an extra request is avoided. The geojson format used here consists of a single
 "FeatureCollection" (representing the <wrmap>) containing the sub-elements of wrmap
 as features.
 The features have an properties key that has a hash as values with the properties of