| Index: trunk/extensions/Maps/Maps.php |
| — | — | @@ -33,10 +33,9 @@ |
| 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.4 a3'); |
| | 37 | + define('Maps_VERSION', '0.5.4 a4'); |
| 38 | 38 | |
| 39 | | - // TODO: try to get out the hardcoded path. |
| 40 | | - $egMapsScriptPath = $wgScriptPath . '/extensions/Maps'; |
| | 39 | + $egMapsScriptPath = (isset($wgExtensionAssetsPath) && $wgExtensionAssetsPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions') . '/Maps'; |
| 41 | 40 | $egMapsDir = dirname( __FILE__ ) . '/'; |
| 42 | 41 | |
| 43 | 42 | $egMapsStyleVersion = $wgStyleVersion . '-' . Maps_VERSION; |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMapsDispMap.php |
| — | — | @@ -69,7 +69,7 @@ |
| 70 | 70 | |
| 71 | 71 | $this->output .=<<<END |
| 72 | 72 | |
| 73 | | -<div id="$this->mapName" class="$this->class" style="$this->style" ></div> |
| | 73 | +<div id="$this->mapName"></div> |
| 74 | 74 | <script type="$wgJsMimeType"> /*<![CDATA[*/ |
| 75 | 75 | addOnloadHook( |
| 76 | 76 | initializeGoogleMap('$this->mapName', |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMaps.php |
| — | — | @@ -89,8 +89,6 @@ |
| 90 | 90 | 'default' => $egMapsGoogleAutozoom, |
| 91 | 91 | 'output-type' => 'boolstr' |
| 92 | 92 | ), |
| 93 | | - 'class' => array(), |
| 94 | | - 'style' => array(), |
| 95 | 93 | ); |
| 96 | 94 | } |
| 97 | 95 | |
| Index: trunk/extensions/Maps/GoogleMaps/Maps_GoogleMapsDispPoint.php |
| — | — | @@ -71,7 +71,7 @@ |
| 72 | 72 | |
| 73 | 73 | $this->output .=<<<END |
| 74 | 74 | |
| 75 | | -<div id="$this->mapName" class="$this->class" style="$this->style" ></div> |
| | 75 | +<div id="$this->mapName"></div> |
| 76 | 76 | <script type="$wgJsMimeType"> /*<![CDATA[*/ |
| 77 | 77 | addOnloadHook( |
| 78 | 78 | initializeGoogleMap('$this->mapName', |