r92087 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r92086‎ | r92087 | r92088 >
Date:19:39, 13 July 2011
Author:jeroendedauw
Status:deferred
Tags:
Comment:
follow up to r92086
Modified paths:
  • /trunk/extensions/SemanticMaps/includes/forminputs/SM_FormInput.php (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/services/GoogleMaps3/ext.sm.googlemapsinput.js (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/services/OpenLayers/ext.sm.openlayersinput.js (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/services/YahooMaps/ext.sm.yahoomaps.js (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticMaps/includes/services/GoogleMaps3/ext.sm.googlemapsinput.js
@@ -11,22 +11,22 @@
1212
1313 jQuery(document).ready(function() {
1414 if ( true ) { // TODO
15 - for ( i in window.maps.googlemaps3_forminputs ) {
16 - if ( window.maps.googlemaps3_forminputs[i].ismulti ) {
17 - jQuery( '#' + i + '_forminput' ).gmapsmultiinput( i, window.maps.googlemaps3_forminputs[i] );
 15+ for ( i in window.mwmaps.googlemaps3_forminputs ) {
 16+ if ( window.mwmaps.googlemaps3_forminputs[i].ismulti ) {
 17+ jQuery( '#' + i + '_forminput' ).gmapsmultiinput( i, window.mwmaps.googlemaps3_forminputs[i] );
1818 }
1919 else {
20 - jQuery( '#' + i + '_forminput' ).googlemapsinput( i, window.maps.googlemaps3_forminputs[i] );
 20+ jQuery( '#' + i + '_forminput' ).googlemapsinput( i, window.mwmaps.googlemaps3_forminputs[i] );
2121 }
2222 }
2323 }
2424 else {
2525 alert( mediaWiki.msg( 'maps-googlemaps3-incompatbrowser' ) );
2626
27 - for ( i in window.maps.googlemaps3_forminputs ) {
 27+ for ( i in window.mwmaps.googlemaps3_forminputs ) {
2828 jQuery( '#' + i + '_forminput' )
2929 .html( $( '<input />' )
30 - .attr( { 'name': i, 'value': semanticMaps.buildInputValue( window.maps.googlemaps3_forminputs[i].locations ) } )
 30+ .attr( { 'name': i, 'value': semanticMaps.buildInputValue( window.mwmaps.googlemaps3_forminputs[i].locations ) } )
3131 );
3232 }
3333 }
Index: trunk/extensions/SemanticMaps/includes/services/YahooMaps/ext.sm.yahoomaps.js
@@ -11,14 +11,14 @@
1212
1313 jQuery(document).ready(function() {
1414 if ( true ) {
15 - for ( i in window.maps.yahoomaps_forminputs ) {
16 - jQuery( '#' + i + '_forminput' ).yahoomapsinput( i, window.maps.yahoomaps_forminputs[i] );
 15+ for ( i in window.mwmaps.yahoomaps_forminputs ) {
 16+ jQuery( '#' + i + '_forminput' ).yahoomapsinput( i, window.mwmaps.yahoomaps_forminputs[i] );
1717 }
1818 }
1919 else {
2020 alert( mediaWiki.msg( 'maps-yahoomaps-incompatbrowser' ) );
2121
22 - for ( i in window.maps.yahoomaps_forminputs ) {
 22+ for ( i in window.mwmaps.yahoomaps_forminputs ) {
2323 jQuery( '#' + i + '_forminput' ).text( mediaWiki.msg( 'maps-load-failed' ) );
2424 }
2525 }
Index: trunk/extensions/SemanticMaps/includes/services/OpenLayers/ext.sm.openlayersinput.js
@@ -11,14 +11,14 @@
1212
1313 jQuery(document).ready(function() {
1414 if ( true ) {
15 - for ( i in window.maps.openlayers_forminputs ) {
16 - jQuery( '#' + i + '_forminput' ).openlayersinput( i, window.maps.openlayers_forminputs[i] );
 15+ for ( i in window.mwmaps.openlayers_forminputs ) {
 16+ jQuery( '#' + i + '_forminput' ).openlayersinput( i, window.mwmaps.openlayers_forminputs[i] );
1717 }
1818 }
1919 else {
2020 alert( mediaWiki.msg( 'maps-openlayers-incompatbrowser' ) );
2121
22 - for ( i in window.maps.openlayers_forminputs ) {
 22+ for ( i in window.mwmaps.openlayers_forminputs ) {
2323 jQuery( '#' + i + '_forminput' ).text( mediaWiki.msg( 'maps-load-failed' ) );
2424 }
2525 }
Index: trunk/extensions/SemanticMaps/includes/forminputs/SM_FormInput.php
@@ -189,7 +189,7 @@
190190
191191 return Html::inlineScript(
192192 MapsMapper::getBaseMapJSON( $this->service->getName() . '_forminputs' )
193 - . "maps.{$this->service->getName()}_forminputs.{$mapName}=" . FormatJson::encode( $object ) . ';'
 193+ . "mwmaps.{$this->service->getName()}_forminputs.{$mapName}=" . FormatJson::encode( $object ) . ';'
194194 );
195195 }
196196

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92086some work on adding KML support to googlemaps v3jeroendedauw19:39, 13 July 2011