r94887 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r94886‎ | r94887 | r94888 >
Date:12:44, 18 August 2011
Author:jeroendedauw
Status:deferred
Tags:
Comment:
fxied fail and incremented version nr
Modified paths:
  • /trunk/extensions/Maps/INSTALL (modified) (history)
  • /trunk/extensions/Maps/Maps.php (modified) (history)
  • /trunk/extensions/Maps/RELEASE-NOTES (modified) (history)
  • /trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js (modified) (history)

Diff [purge]

Index: trunk/extensions/Maps/INSTALL
@@ -1,4 +1,4 @@
2 -[[Maps 1.0.1]]
 2+[[Maps 1.0.2]]
33
44 In order to use this version of Maps, you need to have Validator 0.3.6 installed. If you get a distribution
55 from this page, you don't need to bother this, since Validator comes bundled with every release, and will
Index: trunk/extensions/Maps/Maps.php
@@ -41,7 +41,7 @@
4242 die( '<b>Error:</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>.<br />' );
4343 }
4444
45 -define( 'Maps_VERSION', '1.0.1' );
 45+define( 'Maps_VERSION', '1.0.2 alpha' );
4646
4747 $wgExtensionCredits['parserhook'][] = array(
4848 'path' => __FILE__,
Index: trunk/extensions/Maps/RELEASE-NOTES
@@ -7,6 +7,11 @@
88 http://mapping.referata.com/wiki/Maps/Version_history#Maps_change_log
99
1010
 11+=== Maps 1.0.2 ===
 12+(2011-08-xx)
 13+
 14+* Fixed Google Maps v3 JavaScript issue when using Google Earth on unsuported systems.
 15+
1116 === Maps 1.0.1 ===
1217 (2011-08-17)
1318
Index: trunk/extensions/Maps/includes/services/GoogleMaps3/jquery.googlemap.js
@@ -127,6 +127,8 @@
128128 }
129129 };
130130
 131+ this.options = options;
 132+
131133 var showEarth = $.inArray( 'earth', options.types ) !== -1;
132134
133135 // If there are any non-Google KML/KMZ layers, load the geoxml library and use it to add these layers.
@@ -138,7 +140,6 @@
139141 disableDefaultUI: true,
140142 mapTypeId: options.type == 'earth' ? google.maps.MapTypeId.SATELLITE : eval( 'google.maps.MapTypeId.' + options.type )
141143 };
142 - this.options = options;
143144
144145 // Map controls
145146 mapOptions.panControl = $.inArray( 'pan', options.controls ) != -1;
@@ -258,11 +259,11 @@
259260 }
260261 };
261262
 263+ map.setMapTypeId( GoogleEarth.MAP_TYPE_ID );
262264 setTilt();
263265 }
264266
265267 _this.addOverlays();
266 - map.setMapTypeId( GoogleEarth.MAP_TYPE_ID );
267268 } );
268269 } } );
269270 }