| Index: trunk/extensions/Maps/OpenLayers/OpenLayerFunctions.js |
| — | — | @@ -235,7 +235,7 @@ |
| 236 | 236 | } else { |
| 237 | 237 | marker = new OpenLayers.Marker(markerData.lonlat); |
| 238 | 238 | } |
| 239 | | - |
| | 239 | + |
| 240 | 240 | if (markerData.title.length + markerData.label.length > 0 ) { |
| 241 | 241 | |
| 242 | 242 | // This is the handler for the mousedown event on the marker, and displays the popup |
| — | — | @@ -257,7 +257,7 @@ |
| 258 | 258 | ); |
| 259 | 259 | |
| 260 | 260 | } |
| 261 | | - |
| | 261 | + |
| 262 | 262 | return marker; |
| 263 | 263 | } |
| 264 | 264 | |
| Index: trunk/extensions/Maps/OpenLayers/Maps_OpenLayers.php |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | ), |
| 66 | 66 | 'default' => $egMapsOLControls , |
| 67 | 67 | 'output-type' => array('list', ',', '\'') |
| 68 | | - ), |
| | 68 | + ), |
| 69 | 69 | 'layers' => array( |
| 70 | 70 | 'type' => array('string', 'list'), |
| 71 | 71 | 'criteria' => array( |
| — | — | @@ -152,14 +152,14 @@ |
| 153 | 153 | */ |
| 154 | 154 | public static function addOLDependencies(&$output) { |
| 155 | 155 | global $wgJsMimeType; |
| 156 | | - global $egOpenLayersOnThisPage, $egMapsScriptPath; |
| | 156 | + global $egOpenLayersOnThisPage, $egMapsScriptPath, $egMapsStyleVersion; |
| 157 | 157 | |
| 158 | 158 | if (empty($egOpenLayersOnThisPage)) { |
| 159 | 159 | $egOpenLayersOnThisPage = 0; |
| 160 | 160 | |
| 161 | 161 | $output .="<link rel='stylesheet' href='$egMapsScriptPath/OpenLayers/OpenLayers/theme/default/style.css' type='text/css' /> |
| 162 | 162 | <script type='$wgJsMimeType' src='$egMapsScriptPath/OpenLayers/OpenLayers/OpenLayers.js'></script> |
| 163 | | - <script type='$wgJsMimeType' src='$egMapsScriptPath/OpenLayers/OpenLayerFunctions.min.js'></script> |
| | 163 | + <script type='$wgJsMimeType' src='$egMapsScriptPath/OpenLayers/OpenLayerFunctions.js?$egMapsStyleVersion'></script> |
| 164 | 164 | <script type='$wgJsMimeType'>initOLSettings(200, 100);</script>\n"; |
| 165 | 165 | } |
| 166 | 166 | } |
| — | — | @@ -172,14 +172,8 @@ |
| 173 | 173 | * @return csv string |
| 174 | 174 | */ |
| 175 | 175 | public static function createLayersStringAndLoadDependencies(&$output, array $layers) { |
| 176 | | - $layerItems = ''; |
| 177 | | - foreach ($layers as $layer) { |
| 178 | | - $layer = strtolower($layer); |
| 179 | | - $layerItems .= "'$layer'" . ','; |
| 180 | | - self::loadDependencyWhenNeeded($output, $layer); |
| 181 | | - } |
| 182 | | - |
| 183 | | - return rtrim($layerItems, ','); |
| | 176 | + foreach ($layers as $layer) self::loadDependencyWhenNeeded($output, $layer); |
| | 177 | + return "'" . implode("','", $layers) . "'"; |
| 184 | 178 | } |
| 185 | 179 | |
| 186 | 180 | } |
| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -33,7 +33,7 @@ |
| 34 | 34 | echo '<b>Warning:</b> You need to have <a href="http://www.mediawiki.org/wiki/Extension:Validator">Validator</a> installed in order to use <a href="http://www.mediawiki.org/wiki/Extension:Maps">Maps</a>.'; |
| 35 | 35 | } |
| 36 | 36 | else { |
| 37 | | - define('Maps_VERSION', '0.5.3 a4'); |
| | 37 | + define('Maps_VERSION', '0.5.3 a5'); |
| 38 | 38 | |
| 39 | 39 | $egMapsScriptPath = $wgScriptPath . '/extensions/Maps'; |
| 40 | 40 | $egMapsIP = $IP . '/extensions/Maps'; |