From: <lph...@us...> - 2013-01-28 15:29:52
|
Revision: 44651 http://sourceforge.net/p/tikiwiki/code/44651 Author: lphuberdeau Date: 2013-01-28 15:29:48 +0000 (Mon, 28 Jan 2013) Log Message: ----------- [FIX] Map pop-up behavior not consistent depending on how the item was loaded Modified Paths: -------------- branches/10.x/lib/jquery_tiki/tiki-maps.js branches/10.x/lib/objectlib.php Modified: branches/10.x/lib/jquery_tiki/tiki-maps.js =================================================================== --- branches/10.x/lib/jquery_tiki/tiki-maps.js 2013-01-28 12:46:58 UTC (rev 44650) +++ branches/10.x/lib/jquery_tiki/tiki-maps.js 2013-01-28 15:29:48 UTC (rev 44651) @@ -582,6 +582,8 @@ , zoom = $(this).data('geo-zoom') , extent = $(this).data('geo-extent') , icon = $(this).data('icon-src') + , object = $(this).data('object') + , type = $(this).data('type') , content = $(this).clone().data({}).wrap('<span/>').parent().html() ; @@ -590,6 +592,8 @@ central = {lat: lat, lon: lon, zoom: zoom ? zoom : 0}; } else { $(container).addMapMarker({ + type: type, + object: object, lon: lon, lat: lat, content: content, Modified: branches/10.x/lib/objectlib.php =================================================================== --- branches/10.x/lib/objectlib.php 2013-01-28 12:46:58 UTC (rev 44650) +++ branches/10.x/lib/objectlib.php 2013-01-28 15:29:48 UTC (rev 44651) @@ -509,7 +509,7 @@ if ($coordinates = TikiLib::lib('geo')->get_coordinates($type, $object)) { $classList[] = 'geolocated'; - $metadata = " data-geo-lat=\"{$coordinates['lat']}\" data-geo-lon=\"{$coordinates['lon']}\""; + $metadata .= " data-geo-lat=\"{$coordinates['lat']}\" data-geo-lon=\"{$coordinates['lon']}\""; if (isset($coordinates['zoom'])) { $metadata .= " data-geo-zoom=\"{$coordinates['zoom']}\""; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |