| Index: trunk/extensions/SemanticMaps/Services/YahooMaps/SM_YahooMapsFormInput.php |
| — | — | @@ -48,13 +48,8 @@ |
| 49 | 49 | global $wgOut; |
| 50 | 50 | global $smgScriptPath, $smgYahooFormsOnThisPage, $smgStyleVersion, $egMapsJsExt; |
| 51 | 51 | |
| | 52 | + $this->service->addDependency( Html::linkedScript( "$smgScriptPath/Services/YahooMaps/SM_YahooMapsFunctions{$egMapsJsExt}?$smgStyleVersion" ) ); |
| 52 | 53 | $this->service->addDependencies( $wgOut ); |
| 53 | | - |
| 54 | | - if ( empty( $smgYahooFormsOnThisPage ) ) { |
| 55 | | - $smgYahooFormsOnThisPage = 0; |
| 56 | | - |
| 57 | | - $wgOut->addScriptFile( "$smgScriptPath/Services/YahooMaps/SM_YahooMapsFunctions{$egMapsJsExt}?$smgStyleVersion" ); |
| 58 | | - } |
| 59 | 54 | } |
| 60 | 55 | |
| 61 | 56 | /** |
| Index: trunk/extensions/SemanticMaps/Services/OpenLayers/SM_OpenLayersFormInput.php |
| — | — | @@ -38,13 +38,8 @@ |
| 39 | 39 | global $wgOut; |
| 40 | 40 | global $smgScriptPath, $smgOLFormsOnThisPage, $smgStyleVersion, $egMapsJsExt; |
| 41 | 41 | |
| | 42 | + $this->service->addDependency( Html::linkedScript( "$smgScriptPath/Services/OpenLayers/SM_OpenLayersFunctions{$egMapsJsExt}?$smgStyleVersion" ) ); |
| 42 | 43 | $this->service->addDependencies( $wgOut ); |
| 43 | | - |
| 44 | | - if ( empty( $smgOLFormsOnThisPage ) ) { |
| 45 | | - $smgOLFormsOnThisPage = 0; |
| 46 | | - |
| 47 | | - $wgOut->addScriptFile( "$smgScriptPath/Services/OpenLayers/SM_OpenLayersFunctions{$egMapsJsExt}?$smgStyleVersion" ); |
| 48 | | - } |
| 49 | 44 | } |
| 50 | 45 | |
| 51 | 46 | /** |
| Index: trunk/extensions/SemanticMaps/Services/GoogleMaps/SM_GoogleMapsFormInput.php |
| — | — | @@ -52,12 +52,8 @@ |
| 53 | 53 | global $wgOut; |
| 54 | 54 | global $smgScriptPath, $smgGoogleFormsOnThisPage, $smgStyleVersion, $egMapsJsExt; |
| 55 | 55 | |
| | 56 | + $this->service->addDependency( Html::linkedScript( "$smgScriptPath/Services/GoogleMaps/SM_GoogleMapsFunctions{$egMapsJsExt}?$smgStyleVersion" ) ); |
| 56 | 57 | $this->service->addDependencies( $wgOut ); |
| 57 | | - |
| 58 | | - if ( empty( $smgGoogleFormsOnThisPage ) ) { |
| 59 | | - $smgGoogleFormsOnThisPage = 0; |
| 60 | | - $wgOut->addScriptFile( "$smgScriptPath/Services/GoogleMaps/SM_GoogleMapsFunctions{$egMapsJsExt}?$smgStyleVersion" ); |
| 61 | | - } |
| 62 | 58 | } |
| 63 | 59 | |
| 64 | 60 | /** |
| Index: trunk/extensions/SemanticMaps/Features/FormInputs/SM_FormInput.php |
| — | — | @@ -192,6 +192,8 @@ |
| 193 | 193 | |
| 194 | 194 | $this->addSpecificMapHTML(); |
| 195 | 195 | |
| | 196 | + $this->addFormDependencies(); |
| | 197 | + |
| 196 | 198 | return array( $this->output . $this->errorList, '' ); |
| 197 | 199 | } |
| 198 | 200 | |