| Index: trunk/extensions/SemanticMaps/includes/services/GoogleMaps3/SM_GoogleMaps3.php |
| — | — | @@ -30,7 +30,7 @@ |
| 31 | 31 | ); |
| 32 | 32 | |
| 33 | 33 | $wgResourceModules['ext.sm.fi.googlemaps3'] = $moduleTemplate + array( |
| 34 | | - 'dependencies' => array( 'ext.maps.googlemaps3' ), |
| | 34 | + 'dependencies' => array( 'ext.maps.googlemaps3', 'ext.sm.forminputs' ), |
| 35 | 35 | 'scripts' => array( |
| 36 | 36 | 'ext.sm.googlemapsinput.js' |
| 37 | 37 | ), |
| — | — | @@ -42,12 +42,6 @@ |
| 43 | 43 | 'jquery.googlemapsinput.js', |
| 44 | 44 | ), |
| 45 | 45 | 'messages' => array( |
| 46 | | - 'semanticmaps_enteraddresshere', |
| 47 | | - 'semanticmaps-updatemap', |
| 48 | | - 'semanticmaps_lookupcoordinates', |
| 49 | | - 'semanticmaps-forminput-remove', |
| 50 | | - 'semanticmaps-forminput-add', |
| 51 | | - 'semanticmaps-forminput-locations' |
| 52 | 46 | ) |
| 53 | 47 | ); |
| 54 | 48 | /* |
| Index: trunk/extensions/SemanticMaps/includes/services/YahooMaps/SM_YahooMaps.php |
| — | — | @@ -21,22 +21,14 @@ |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | $wgResourceModules['ext.sm.fi.yahoomaps'] = array( |
| 25 | | - 'dependencies' => array( 'ext.maps.yahoomaps' ), |
| | 25 | + 'dependencies' => array( 'ext.maps.yahoomaps', 'ext.sm.forminputs' ), |
| 26 | 26 | 'localBasePath' => dirname( __FILE__ ), |
| 27 | | - 'remoteBasePath' => $smgScriptPath . '/includes/services/OpenLayers', |
| | 27 | + 'remoteBasePath' => $smgScriptPath . '/includes/services/YahooMaps', |
| 28 | 28 | 'group' => 'ext.semanticmaps', |
| 29 | 29 | 'scripts' => array( |
| 30 | | - 'jquery.openlayersinput.js', |
| 31 | | - 'ext.sm.openlayersinput.js' |
| | 30 | + 'jquery.yahoomapsinput.js', |
| | 31 | + 'ext.sm.yahoomaps.js' |
| 32 | 32 | ), |
| 33 | | - 'messages' => array( |
| 34 | | - 'semanticmaps_enteraddresshere', |
| 35 | | - 'semanticmaps-updatemap', |
| 36 | | - 'semanticmaps_lookupcoordinates', |
| 37 | | - 'semanticmaps-forminput-remove', |
| 38 | | - 'semanticmaps-forminput-add', |
| 39 | | - 'semanticmaps-forminput-locations' |
| 40 | | - ) |
| 41 | 33 | ); |
| 42 | 34 | |
| 43 | 35 | $wgHooks['MappingServiceLoad'][] = 'smfInitYahooMaps'; |
| Index: trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayers.php |
| — | — | @@ -21,21 +21,15 @@ |
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | $wgResourceModules['ext.sm.fi.openlayers'] = array( |
| 25 | | - 'dependencies' => array( 'ext.maps.openlayers' ), |
| | 25 | + 'dependencies' => array( 'ext.maps.openlayers', 'ext.sm.forminputs' ), |
| 26 | 26 | 'localBasePath' => dirname( __FILE__ ), |
| 27 | | - 'remoteBasePath' => $smgScriptPath . '/includes/services/YahooMaps', |
| | 27 | + 'remoteBasePath' => $smgScriptPath . '/includes/services/OpenLayers', |
| 28 | 28 | 'group' => 'ext.semanticmaps', |
| 29 | 29 | 'scripts' => array( |
| 30 | | - 'jquery.yahoomapsinput.js', |
| 31 | | - 'ext.sm.yahoomapsinput.js' |
| | 30 | + 'jquery.openlayersinput.js', |
| | 31 | + 'ext.sm.openlayersinput.js' |
| 32 | 32 | ), |
| 33 | 33 | 'messages' => array( |
| 34 | | - 'semanticmaps_enteraddresshere', |
| 35 | | - 'semanticmaps-updatemap', |
| 36 | | - 'semanticmaps_lookupcoordinates', |
| 37 | | - 'semanticmaps-forminput-remove', |
| 38 | | - 'semanticmaps-forminput-add', |
| 39 | | - 'semanticmaps-forminput-locations' |
| 40 | 34 | ) |
| 41 | 35 | ); |
| 42 | 36 | |
| Index: trunk/extensions/SemanticMaps/includes/forminputs/SM_FormInputs.php |
| — | — | @@ -22,6 +22,12 @@ |
| 23 | 23 | 'jquery.mapforminput.js' |
| 24 | 24 | ), |
| 25 | 25 | 'messages' => array( |
| | 26 | + 'semanticmaps_enteraddresshere', |
| | 27 | + 'semanticmaps-updatemap', |
| | 28 | + 'semanticmaps_lookupcoordinates', |
| | 29 | + 'semanticmaps-forminput-remove', |
| | 30 | + 'semanticmaps-forminput-add', |
| | 31 | + 'semanticmaps-forminput-locations' |
| 26 | 32 | ) |
| 27 | 33 | ); |
| 28 | 34 | |