| Index: branches/resourceloader/phase3/includes/ResourceLoader.php |
| — | — | @@ -234,6 +234,7 @@ |
| 235 | 235 | * |
| 236 | 236 | * Also, the naming of these variables is horrible and sad, hopefully this can be worked on |
| 237 | 237 | */ |
| | 238 | + $parameters['server'] = dirname( $_SERVER['REQUEST_URI'] ); |
| 238 | 239 | echo "mw.config.set( " . json_encode( $parameters ) . " );\n"; |
| 239 | 240 | // Collect all loaders |
| 240 | 241 | $loaders = array(); |
| Index: branches/resourceloader/phase3/resources/test/index.html |
| — | — | @@ -7,17 +7,8 @@ |
| 8 | 8 | body { |
| 9 | 9 | font-size: 100.01%; |
| 10 | 10 | } |
| 11 | | - p { |
| 12 | | - font-size: 0.8em; |
| 13 | | - } |
| 14 | | - #tests li { |
| 15 | | - color: white; |
| 16 | | - } |
| 17 | 11 | </style> |
| 18 | | - <script type="text/javascript" src="../../load.php?modules=jquery|mediawiki&debug=false&skin=cyborg&lang=ja"></script> |
| 19 | | - <script type="text/javascript"> |
| 20 | | - mw.config.set( 'wgScriptPath', '../..' ); |
| 21 | | - </script> |
| | 12 | + <script type="text/javascript" src="../../load.php?modules=jquery|mediawiki&debug=true&skin=vector&lang=ja"></script> |
| 22 | 13 | </head> |
| 23 | 14 | <body> |
| 24 | 15 | <h1>Resource Loader Tests</h1> |
| Index: branches/resourceloader/phase3/resources/mediawiki/mediawiki.js |
| — | — | @@ -406,7 +406,7 @@ |
| 407 | 407 | var html = ''; |
| 408 | 408 | for ( var r = 0; r < requests.length; r++ ) { |
| 409 | 409 | // Build out the HTML |
| 410 | | - var src = mw.config.get( 'wgScriptPath' ) + '/load.php?' + jQuery.param( requests[r] ); |
| | 410 | + var src = mw.config.get( 'server' ) + '/load.php?' + jQuery.param( requests[r] ); |
| 411 | 411 | html += '<script type="text/javascript" src="' + src + '"></script>'; |
| 412 | 412 | } |
| 413 | 413 | // Append script to body |