X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fresourceloader%2FResourceLoaderModule.php;h=48e7937104cef639aa694bb21279059d7ecc5344;hb=3cfcd55011244c0767079bf4dbeb0dcc2345d34c;hp=13f13e68bf9facc885ee35bcba628857c96fa09e;hpb=3071f1fad720f1773864621158a0c59b73124896;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/resourceloader/ResourceLoaderModule.php b/includes/resourceloader/ResourceLoaderModule.php
index 13f13e68bf..48e7937104 100644
--- a/includes/resourceloader/ResourceLoaderModule.php
+++ b/includes/resourceloader/ResourceLoaderModule.php
@@ -35,6 +35,12 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	const TYPE_STYLES = 'styles';
 	const TYPE_COMBINED = 'combined';
 
+	# Desired load type
+	// Module only has styles (loaded via <style> or <link rel=stylesheet>)
+	const LOAD_STYLES = 'styles';
+	// Module may have other resources (loaded via mw.loader from a script)
+	const LOAD_GENERAL = 'general';
+
 	# sitewide core module like a skin file or jQuery component
 	const ORIGIN_CORE_SITEWIDE = 1;
 
@@ -76,6 +82,11 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 	 */
 	protected $config;
 
+	/**
+	 * @var array|bool
+	 */
+	protected $deprecated = false;
+
 	/**
 	 * @var LoggerInterface
 	 */
@@ -114,16 +125,6 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 		return $this->origin;
 	}
 
-	/**
-	 * Set this module's origin. This is called by ResourceLoader::register()
-	 * when registering the module. Other code should not call this.
-	 *
-	 * @param int $origin Origin
-	 */
-	public function setOrigin( $origin ) {
-		$this->origin = $origin;
-	}
-
 	/**
 	 * @param ResourceLoaderContext $context
 	 * @return bool
@@ -134,6 +135,28 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 		return $wgContLang->getDir() !== $context->getDirection();
 	}
 
+	/**
+	 * Get JS representing deprecation information for the current module if available
+	 *
+	 * @return string JavaScript code
+	 */
+	protected function getDeprecationInformation() {
+		$deprecationInfo = $this->deprecated;
+		if ( $deprecationInfo ) {
+			$name = $this->getName();
+			$warning = 'This page is using the deprecated ResourceLoader module "' . $name . '".';
+			if ( !is_bool( $deprecationInfo ) && isset( $deprecationInfo['message'] ) ) {
+				$warning .= "\n" . $deprecationInfo['message'];
+			}
+			return Xml::encodeJsCall(
+				'mw.log.warn',
+				[ $warning ]
+			);
+		} else {
+			return '';
+		}
+	}
+
 	/**
 	 * Get all JS for this module for a given language and skin.
 	 * Includes all relevant JS except loader scripts.
@@ -353,6 +376,16 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 		return $this->targets;
 	}
 
+	/**
+	 * Get the module's load type.
+	 *
+	 * @since 1.28
+	 * @return string ResourceLoaderModule LOAD_* constant
+	 */
+	public function getType() {
+		return self::LOAD_GENERAL;
+	}
+
 	/**
 	 * Get the skip function.
 	 *
@@ -453,7 +486,7 @@ abstract class ResourceLoaderModule implements LoggerAwareInterface {
 					]
 				);
 
-				$dbw->onTransactionIdle( function () use ( &$scopeLock ) {
+				$dbw->onTransactionResolution( function () use ( &$scopeLock ) {
 					ScopedCallback::consume( $scopeLock ); // release after commit
 				} );
 			}