| Index: branches/Maps0.8/includes/services/GoogleMaps3/Maps_GoogleMaps3.php |
| — | — | @@ -129,28 +129,6 @@ |
| 130 | 130 | } |
| 131 | 131 | |
| 132 | 132 | /** |
| 133 | | - * @see MapsMappingService::createMarkersJs |
| 134 | | - * |
| 135 | | - * @since 0.6.5 |
| 136 | | - */ |
| 137 | | - public function createMarkersJs( array $markers ) { |
| 138 | | - $markerItems = array(); |
| 139 | | - |
| 140 | | - foreach ( $markers as $marker ) { |
| 141 | | - $markerItems[] = Xml::encodeJsVar( (object)array( |
| 142 | | - 'lat' => $marker[0], |
| 143 | | - 'lon' => $marker[1], |
| 144 | | - 'title' => $marker[2], |
| 145 | | - 'label' =>$marker[3], |
| 146 | | - 'icon' => $marker[4] |
| 147 | | - ) ); |
| 148 | | - } |
| 149 | | - |
| 150 | | - // Create a string containing the marker JS. |
| 151 | | - return '[' . implode( ',', $markerItems ) . ']'; |
| 152 | | - } |
| 153 | | - |
| 154 | | - /** |
| 155 | 133 | * Returns the names of all supported map types. |
| 156 | 134 | * |
| 157 | 135 | * @return array |
| — | — | @@ -171,8 +149,7 @@ |
| 172 | 150 | $languageCode = self::getMappedLanguageCode( $wgLang->getCode() ); |
| 173 | 151 | |
| 174 | 152 | return array( |
| 175 | | - Html::linkedScript( "http://maps.google.com/maps/api/js?sensor=false&language=$languageCode" ), |
| 176 | | - //Html::linkedScript( "$egMapsScriptPath/includes/services/GoogleMaps3/GoogleMap3Functions.js?$egMapsStyleVersion" ), |
| | 153 | + Html::linkedScript( "http://maps.google.com/maps/api/js?sensor=false&language=$languageCode" ) |
| 177 | 154 | ); |
| 178 | 155 | } |
| 179 | 156 | |
| — | — | @@ -211,4 +188,4 @@ |
| 212 | 189 | ); |
| 213 | 190 | } |
| 214 | 191 | |
| 215 | | -} |
| \ No newline at end of file |
| | 192 | +} |
| Index: branches/Maps0.8/includes/services/GoogleMaps3/ext.maps.googlemaps3.js |
| — | — | @@ -5,25 +5,6 @@ |
| 6 | 6 | * @author Jeroen De Dauw <jeroendedauw at gmail dot com> |
| 7 | 7 | */ |
| 8 | 8 | |
| 9 | | -/* |
| 10 | | -jQuery.getScript( |
| 11 | | - 'http://maps.google.com/maps/api/js?sensor=false', |
| 12 | | - function () { |
| 13 | | - if ( true ) { |
| 14 | | - for ( i in window.maps.googlemaps3 ) { |
| 15 | | - jQuery( '#' + i ).googlemaps( window.maps.googlemaps3[i] ); |
| 16 | | - } |
| 17 | | - } |
| 18 | | - else { |
| 19 | | - alert( mediaWiki.msg( 'maps-googlemaps3-incompatbrowser' ) ); |
| 20 | | - |
| 21 | | - for ( i in window.maps.googlemaps3 ) { |
| 22 | | - jQuery( '#' + i ).text( mediaWiki.msg( 'maps-load-failed' ) ); |
| 23 | | - } |
| 24 | | - } |
| 25 | | - } |
| 26 | | -);*/ |
| 27 | | - |
| 28 | 9 | jQuery(document).ready(function() { |
| 29 | 10 | if ( true ) { |
| 30 | 11 | for ( i in window.maps.googlemaps3 ) { |
| — | — | @@ -37,4 +18,4 @@ |
| 38 | 19 | jQuery( '#' + i ).text( mediaWiki.msg( 'maps-load-failed' ) ); |
| 39 | 20 | } |
| 40 | 21 | } |
| 41 | | -}); |
| \ No newline at end of file |
| | 22 | +}); |