| Index: branches/resourceloader/phase3/includes/ResourceLoaderModule.php |
| — | — | @@ -29,7 +29,6 @@ |
| 30 | 30 | private $languageScripts = array(); |
| 31 | 31 | private $skinStyles = array(); |
| 32 | 32 | private $loaders = array(); |
| 33 | | - private $raw = false; |
| 34 | 33 | private $parameters = array(); |
| 35 | 34 | |
| 36 | 35 | /* Public methods */ |
| — | — | @@ -71,9 +70,6 @@ |
| 72 | 71 | case 'loaders': |
| 73 | 72 | $this->loaders = (array)$value; |
| 74 | 73 | break; |
| 75 | | - case 'raw': |
| 76 | | - $this->raw = (bool)$value; |
| 77 | | - break; |
| 78 | 74 | } |
| 79 | 75 | } |
| 80 | 76 | } |
| — | — | @@ -175,20 +171,6 @@ |
| 176 | 172 | } |
| 177 | 173 | |
| 178 | 174 | /** |
| 179 | | - * Set this module's raw flag. Raw modules are loaded before the |
| 180 | | - * mediaWiki object and are not wrapped in any loading code. |
| 181 | | - * They can only have scripts and debug scripts, nothing else. |
| 182 | | - * Raw module can still be used as dependencies for other modules. |
| 183 | | - * |
| 184 | | - * Modules are non-raw by default. |
| 185 | | - * |
| 186 | | - * @param $raw bool If true, mark this module as raw, if false, mark it non-raw |
| 187 | | - */ |
| 188 | | - public function setRaw( $raw = true ) { |
| 189 | | - $this->raw = (bool)$raw; |
| 190 | | - } |
| 191 | | - |
| 192 | | - /** |
| 193 | 175 | * Set parameters used for obtaining this module. Ignored in this class |
| 194 | 176 | * but used in subclasses. |
| 195 | 177 | * |
| — | — | @@ -283,15 +265,6 @@ |
| 284 | 266 | } |
| 285 | 267 | |
| 286 | 268 | /** |
| 287 | | - * Check whether this module is in raw mode. See setRaw() for details |
| 288 | | - * on what raw mode is. |
| 289 | | - * @return bool |
| 290 | | - */ |
| 291 | | - public function isRaw() { |
| 292 | | - return $this->raw; |
| 293 | | - } |
| 294 | | - |
| 295 | | - /** |
| 296 | 269 | * Get a parameter previously set through setParameters() |
| 297 | 270 | * @param $param string Parameter name |
| 298 | 271 | * @return mixed Parameter value or null if not set |
| — | — | @@ -325,5 +298,4 @@ |
| 326 | 299 | public function getLanguageScript( $lang ) { return ''; } |
| 327 | 300 | public function getSkinStyle( $skin ) { return ''; } |
| 328 | 301 | public function getLoaderScript() { return false; } |
| 329 | | - public function isRaw() { return true; } |
| 330 | 302 | } |
| Index: branches/resourceloader/phase3/resources/Resources.php |
| — | — | @@ -7,7 +7,7 @@ |
| 8 | 8 | |
| 9 | 9 | /* jQuery */ |
| 10 | 10 | |
| 11 | | - 'jquery' => array( 'scripts' => 'resources/jquery/jquery.js', 'raw' => true ), |
| | 11 | + 'jquery' => array( 'scripts' => 'resources/jquery/jquery.js' ), |
| 12 | 12 | |
| 13 | 13 | /* jQuery Plugins */ |
| 14 | 14 | |
| — | — | @@ -250,7 +250,6 @@ |
| 251 | 251 | 'mediawiki' => array( |
| 252 | 252 | 'scripts' => 'resources/mediawiki/mediawiki.js', |
| 253 | 253 | 'debugScripts' => 'resources/mediawiki/mediawiki.log.js', |
| 254 | | - 'raw' => true, |
| 255 | 254 | ), |
| 256 | 255 | |
| 257 | 256 | /* MediaWiki Legacy */ |