http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72767
Revision: 72767
Author: tparscal
Date: 2010-09-10 23:28:59 +0000 (Fri, 10 Sep 2010)
Log Message:
-----------
Moved some of the logic for generating styles from wiki pages out of
ResourceLoaderSiteModule and into ResourceLoaderWikiModule.
Modified Paths:
--------------
trunk/phase3/includes/ResourceLoaderModule.php
Modified: trunk/phase3/includes/ResourceLoaderModule.php
===================================================================
--- trunk/phase3/includes/ResourceLoaderModule.php 2010-09-10 23:09:34 UTC
(rev 72766)
+++ trunk/phase3/includes/ResourceLoaderModule.php 2010-09-10 23:28:59 UTC
(rev 72767)
@@ -21,7 +21,7 @@
*/
/**
- * Interface for resource loader modules, with name registration and maxage
functionality.
+ * Abstraction for resource loader modules, with name registration and maxage
functionality.
*/
abstract class ResourceLoaderModule {
/* Protected Members */
@@ -674,6 +674,9 @@
}
}
+/**
+ * Abstraction for resource loader modules which pull from wiki pages
+ */
abstract class ResourceLoaderWikiModule extends ResourceLoaderModule {
/* Protected Members */
@@ -685,6 +688,23 @@
abstract protected function getPages( ResourceLoaderContext $context );
+ /* Protected Methods */
+
+ protected function getStyleCode( array $styles ) {
+ foreach ( $styles as $media => $messages ) {
+ foreach ( $messages as $i => $message ) {
+ $style = wfMsgExt( $message, 'content' );
+ if ( !wfEmptyMsg( $message, $style ) ) {
+ $styles[$media][$i] = $style;
+ }
+ }
+ }
+ foreach ( $styles as $media => $messages ) {
+ $styles[$media] = implode( "\n", $messages );
+ }
+ return $styles;
+ }
+
/* Methods */
public function getModifiedTime( ResourceLoaderContext $context ) {
@@ -713,7 +733,7 @@
}
/**
- * Custom module for MediaWiki:Common.js and MediaWiki:Skinname.js
+ * Custom module for site customizations
*/
class ResourceLoaderSiteModule extends ResourceLoaderWikiModule {
@@ -752,18 +772,7 @@
if ( $wgHandheldStyle ) {
$sources['handheld'] = array( 'Handheld.css' );
}
- foreach ( $styles as $media => $messages ) {
- foreach ( $messages as $i => $message ) {
- $style = wfMsgExt( $message, 'content' );
- if ( !wfEmptyMsg( $message, $style ) ) {
- $styles[$media][$i] = $style;
- }
- }
- }
- foreach ( $styles as $media => $messages ) {
- $styles[$media] = implode( "\n", $messages );
- }
- return $styles;
+ return $this->getStyleCode( $styles );
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
