*/
public $mModules = [];
- /**
- * @var array $mModuleScripts Modules of which only the JS will be loaded by ResourceLoader.
- */
- public $mModuleScripts = [];
-
/**
* @var array $mModuleStyles Modules of which only the CSSS will be loaded by ResourceLoader.
*/
}
public function getModuleScripts() {
- return $this->mModuleScripts;
+ wfDeprecated( __METHOD__, '1.33' );
+ return [];
}
public function getModuleStyles() {
$this->mModules = array_merge( $this->mModules, (array)$modules );
}
- /**
- * @deprecated since 1.31 Use addModules() instead.
- * @see OutputPage::addModuleScripts
- */
- public function addModuleScripts( $modules ) {
- $this->mModuleScripts = array_merge( $this->mModuleScripts, (array)$modules );
- }
-
/**
* @see OutputPage::addModuleStyles
*/
*/
public function addOutputPageMetadata( OutputPage $out ) {
$this->addModules( $out->getModules() );
- $this->addModuleScripts( $out->getModuleScripts() );
$this->addModuleStyles( $out->getModuleStyles() );
$this->addJsConfigVars( $out->getJsConfigVars() );
// HTML and HTTP
$this->mHeadItems = self::mergeMixedList( $this->mHeadItems, $source->getHeadItems() );
$this->mModules = self::mergeList( $this->mModules, $source->getModules() );
- $this->mModuleScripts = self::mergeList( $this->mModuleScripts, $source->getModuleScripts() );
$this->mModuleStyles = self::mergeList( $this->mModuleStyles, $source->getModuleStyles() );
$this->mJsConfigVars = self::mergeMap( $this->mJsConfigVars, $source->getJsConfigVars() );
$this->mMaxAdaptiveExpiry = min( $this->mMaxAdaptiveExpiry, $source->mMaxAdaptiveExpiry );
// TODO: we'll have to be smarter about this!
$this->mSections = array_merge( $this->mSections, $source->getSections() );
- $this->mTOCHTML = $this->mTOCHTML . $source->mTOCHTML;
+ $this->mTOCHTML .= $source->mTOCHTML;
// XXX: we don't want to concatenate title text, so first write wins.
// We should use the first *modified* title text, but we don't have the original to check.