| Index: trunk/phase3/includes/resourceloader/ResourceLoader.php |
| — | — | @@ -43,11 +43,9 @@ |
| 44 | 44 | * This method grabs modules dependencies from the database and updates modules objects. |
| 45 | 45 | * |
| 46 | 46 | * This is not inside the module code because it's so much more performant to request all of the information at once |
| 47 | | - * than it is to have each module requests it's own information. This sacrifice of modularity yields a profound |
| | 47 | + * than it is to have each module requests its own information. This sacrifice of modularity yields a profound |
| 48 | 48 | * performance improvement. |
| 49 | 49 | * |
| 50 | | - * A first pass calculates dependent file modified times, a second one calculates message blob modified times. |
| 51 | | - * |
| 52 | 50 | * @param {array} $modules List of module names to preload information for |
| 53 | 51 | * @param {ResourceLoaderContext} $context Context to load the information within |
| 54 | 52 | */ |
| — | — | @@ -66,7 +64,7 @@ |
| 67 | 65 | ), __METHOD__ |
| 68 | 66 | ); |
| 69 | 67 | |
| 70 | | - // Set modules dependecies |
| | 68 | + // Set modules' dependecies |
| 71 | 69 | $modulesWithDeps = array(); |
| 72 | 70 | foreach ( $res as $row ) { |
| 73 | 71 | $this->modules[$row->md_module]->setFileDependencies( $skin, |
| — | — | @@ -108,12 +106,12 @@ |
| 109 | 107 | /** |
| 110 | 108 | * Runs JavaScript or CSS data through a filter, caching the filtered result for future calls. |
| 111 | 109 | * |
| 112 | | - * Availables filters are: |
| | 110 | + * Available filters are: |
| 113 | 111 | * - minify-js \see JSMin::minify |
| 114 | 112 | * - minify-css \see CSSMin::minify |
| 115 | 113 | * - flip-css \see CSSJanus::transform |
| 116 | 114 | * |
| 117 | | - * If data is empty, only whitespace or the filter was unknown, data is returned unmodified. |
| | 115 | + * If $data is empty, only contains whitespace or the filter was unknown, $data is returned unmodified. |
| 118 | 116 | * |
| 119 | 117 | * @param {string} $filter Name of filter to run |
| 120 | 118 | * @param {string} $data Text to filter, such as JavaScript or CSS text |
| — | — | @@ -327,10 +325,10 @@ |
| 328 | 326 | * |
| 329 | 327 | * @param {ResourceLoaderContext} $context Context in which to generate a response |
| 330 | 328 | * @param {array} $modules List of module objects keyed by module name |
| 331 | | - * @param {array} $missing List of unavailables modules (optional) |
| | 329 | + * @param {array} $missing List of unavailable modules (optional) |
| 332 | 330 | * @return {string} Response data |
| 333 | 331 | */ |
| 334 | | - public function makeModuleResponse( ResourceLoaderContext $context, array $modules, $missing = null ) { |
| | 332 | + public function makeModuleResponse( ResourceLoaderContext $context, array $modules, $missing = array() ) { |
| 335 | 333 | // Pre-fetch blobs |
| 336 | 334 | $blobs = $context->shouldIncludeMessages() ? |
| 337 | 335 | MessageBlobStore::get( $this, $modules, $context->getLanguage() ) : array(); |
| Index: trunk/phase3/includes/resourceloader/ResourceLoaderContext.php |
| — | — | @@ -51,10 +51,10 @@ |
| 52 | 52 | $this->request = $request; |
| 53 | 53 | |
| 54 | 54 | // Interpret request |
| 55 | | - # list of modules |
| | 55 | + // List of modules |
| 56 | 56 | $modules = $request->getVal( 'modules' ); |
| 57 | 57 | $this->modules = $modules ? explode( '|', $modules ) : array(); |
| 58 | | - # various parameters |
| | 58 | + // Various parameters |
| 59 | 59 | $this->language = $request->getVal( 'lang' ); |
| 60 | 60 | $this->direction = $request->getVal( 'dir' ); |
| 61 | 61 | $this->skin = $request->getVal( 'skin' ); |