| Index: trunk/extensions/Collection/collection/collection.js |
| — | — | @@ -21,6 +21,8 @@ |
| 22 | 22 | |
| 23 | 23 | (function() { |
| 24 | 24 | |
| | 25 | +var jQuery = collection_jQuery; |
| | 26 | + |
| 25 | 27 | /******************************************************************************/ |
| 26 | 28 | |
| 27 | 29 | var requiredVersion = '1.2'; |
| Index: trunk/extensions/Collection/Collection.body.php |
| — | — | @@ -265,7 +265,7 @@ |
| 266 | 266 | $wgOut->addInlineScript( "var wgCollectionVersion = \"$wgCollectionVersion\";" ); |
| 267 | 267 | $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/collection/jquery.js?$wgCollectionStyleVersion\"></script>" ); |
| 268 | 268 | $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/collection/jquery.ui.js?$wgCollectionStyleVersion\"></script>" ); |
| 269 | | - $wgOut->addInlineScript( "jQuery.noConflict();" ); |
| | 269 | + $wgOut->addInlineScript( "var collection_jQuery = jQuery.noConflict();" ); |
| 270 | 270 | $wgOut->addScript( "<script type=\"$wgJsMimeType\" src=\"$wgScriptPath/extensions/Collection/collection/collection.js?$wgCollectionStyleVersion\"></script>" ); |
| 271 | 271 | |
| 272 | 272 | $template = new CollectionPageTemplate(); |