| Index: trunk/extensions/JS2Support/ScriptLoaderOutputPage.php |
| — | — | @@ -10,6 +10,8 @@ |
| 11 | 11 | // Flag javascript Classes loaded |
| 12 | 12 | var $mLoadedJavascriptClasses = false; |
| 13 | 13 | |
| | 14 | + // The path to the script-loader |
| | 15 | + static $mScriptLoaderPath = 'extensions/JS2Support/mwScriptLoader'; |
| 14 | 16 | /** |
| 15 | 17 | * $Script Loader Class List |
| 16 | 18 | * |
| — | — | @@ -327,7 +329,7 @@ |
| 328 | 330 | global $wgRequest, $wgDebugJavaScript; |
| 329 | 331 | $stylesString = implode( ',', $stylesAry ); |
| 330 | 332 | |
| 331 | | - $url = wfScript( 'extensions/JS2Support/mwScriptLoader' ) . |
| | 333 | + $url = wfScript( self::$mScriptLoaderPath ) . |
| 332 | 334 | "?class={$stylesString}&" . $this->getURIDparam( $stylesAry ). "&ctype=css"; |
| 333 | 335 | |
| 334 | 336 | // Check for the media option: |
| — | — | @@ -368,7 +370,7 @@ |
| 369 | 371 | global $wgRequest, $wgDebugJavaScript; |
| 370 | 372 | $classListString = implode( ',', $classAry ); |
| 371 | 373 | |
| 372 | | - return Html::linkedScript( wfScript( 'mwScriptLoader' ) . |
| | 374 | + return Html::linkedScript( wfScript( self::$mScriptLoaderPath ) . |
| 373 | 375 | "?class={$classListString}&" . $this->getURIDparam( $classAry) ) . "\n"; |
| 374 | 376 | } |
| 375 | 377 | |
| Index: trunk/extensions/JS2Support/JS2Support.php |
| — | — | @@ -101,7 +101,7 @@ |
| 102 | 102 | /** |
| 103 | 103 | * Path for mwEmbed normally js/mwEmbed/ |
| 104 | 104 | */ |
| 105 | | -$wgMwEmbedDirectory = "extensions/JS2Support/mwEmbed/"; |
| | 105 | +$wgMwEmbedDirectory = "extensions/JS2Support/js/mwEmbed/"; |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | 108 | * Enables javascript on debugging |
| Index: trunk/extensions/JS2Support/JS2AutoLoader.php |
| — | — | @@ -5,15 +5,15 @@ |
| 6 | 6 | *****************************/ |
| 7 | 7 | $wgAutoloadClasses = array_merge( $wgAutoloadClasses, |
| 8 | 8 | array( |
| 9 | | - 'JSMin' => $dir . 'mwEmbed/includes/library/JSMin.php', |
| 10 | | - 'Minify_CSS' => $dir . 'mwEmbed/includes/library/CSS.php', |
| 11 | | - 'Minify_CommentPreserver' => $dir . 'mwEmbed/includes/library/CommentPreserver.php', |
| 12 | | - 'Minify_CSS_Compressor' => $dir . 'mwEmbed/includes/library/CSS/Compressor.php', |
| 13 | | - 'Minify_CSS_UriRewriter' => $dir . 'mwEmbed/includes/library/CSS/UriRewriter.php', |
| 14 | | - 'JSMinException' => $dir . 'mwEmbed/includes/minify/JSMin.php', |
| 15 | | - 'jsScriptLoader' => $dir . 'mwEmbed/jsScriptLoader.php', |
| 16 | | - 'jsClassLoader' => $dir . 'mwEmbed/includes/jsClassLoader.php', |
| 17 | | - 'simpleFileCache' => $dir . 'mwEmbed/jsScriptLoader.php', |
| | 9 | + 'JSMin' => $dir . 'js/mwEmbed/includes/library/JSMin.php', |
| | 10 | + 'Minify_CSS' => $dir . 'js/mwEmbed/includes/library/CSS.php', |
| | 11 | + 'Minify_CommentPreserver' => $dir . 'js/mwEmbed/includes/library/CommentPreserver.php', |
| | 12 | + 'Minify_CSS_Compressor' => $dir . 'js/mwEmbed/includes/library/CSS/Compressor.php', |
| | 13 | + 'Minify_CSS_UriRewriter' => $dir . 'js/mwEmbed/includes/library/CSS/UriRewriter.php', |
| | 14 | + 'JSMinException' => $dir . 'js/mwEmbed/includes/minify/JSMin.php', |
| | 15 | + 'jsScriptLoader' => $dir . 'js/mwEmbed/jsScriptLoader.php', |
| | 16 | + 'jsClassLoader' => $dir . 'js/mwEmbed/includes/jsClassLoader.php', |
| | 17 | + 'simpleFileCache' => $dir . 'js/mwEmbed/jsScriptLoader.php', |
| 18 | 18 | ) |
| 19 | 19 | ); |
| 20 | 20 | |
| Index: trunk/extensions/JS2Support/mwScriptLoader.php |
| — | — | @@ -27,7 +27,7 @@ |
| 28 | 28 | // First do a quick check for the cached file |
| 29 | 29 | define('MW_CACHE_SCRIPT_CHECK', true); |
| 30 | 30 | |
| 31 | | -require_once( dirname(__FILE__) . '/mwEmbed/jsScriptLoader.php'); |
| | 31 | +require_once( dirname(__FILE__) . '/js/mwEmbed/jsScriptLoader.php'); |
| 32 | 32 | // Do quick cache check via jsScriptLoader |
| 33 | 33 | $myScriptLoader = new jsScriptLoader(); |
| 34 | 34 | if( $myScriptLoader->outputFromCache() ){ |