From 2e201194e08b5d6eb2ae22609a29f32bc3a38b0a Mon Sep 17 00:00:00 2001 From: philipp Date: Thu, 24 Oct 2013 16:35:12 +0000 Subject: [PATCH] Now a status message ('Die Landkarte wird geladen...') is shown at startup instead of raw JSON. git-svn-id: http://www.winterrodeln.org/svn/servermediawiki/mediawiki_extensions/wrmap/trunk@1751 7aebc617-e5e2-0310-91dc-80fb5f6d2477 --- wrmap.body.php | 8 ++++++-- wrmap.js | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/wrmap.body.php b/wrmap.body.php index ccb5b80..3966766 100644 --- a/wrmap.body.php +++ b/wrmap.body.php @@ -234,8 +234,12 @@ class WrBaseMap { // Create
element where the map is placed in global $wgExtensionAssetsPath; $doc = new WrMapDOMDocument(); - $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-img-path' => "$wgExtensionAssetsPath/wrmap/openlayers/img/"))->appendText($json_string); - return array($doc->saveHTML($doc->firstChild), 'markerType' => 'nowiki'); + $div = $doc->appendElement('div', array('class' => 'wrmap', 'style' => 'border-style:none;', 'data-img-path' => "$wgExtensionAssetsPath/wrmap/openlayers/img/")); + // progress message + $div->appendElement('div', array())->appendText('Die Landkarte wird geladen...'); + // data + $div->appendElement('div', array('style' => 'height: 0px; display:none;'))->appendText($json_string); + return array($doc->saveHTML($div), 'markerType' => 'nowiki'); } } diff --git a/wrmap.js b/wrmap.js index 4487305..f6b23ec 100644 --- a/wrmap.js +++ b/wrmap.js @@ -8,7 +8,7 @@ function init_wrmap(i, jq_map) { // extract geojson from map element and clear map element's content jq_map = $(jq_map); OpenLayers.ImgPath = jq_map.attr('data-img-path'); // e.g. "/mediawiki/extensions/wrmap/openlayers/img/" - var json_string = jq_map.text(); + var json_string = jq_map.children().last().text(); jq_map.empty(); // once parsed, remove geojson string from the map element. var format_json = new OpenLayers.Format.JSON(); var json_js = format_json.read(json_string); -- 2.39.5