[MediaWiki-commits] [Gerrit] Don't use deprecated ResourceLoader::makeLoaderURL - change (mediawiki...Mantle)

2014-07-31 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: Don't use deprecated ResourceLoader::makeLoaderURL
..


Don't use deprecated ResourceLoader::makeLoaderURL

Change-Id: Id8acfb5a233b6bdb6d092c3e166575756bc0fa5b
---
M includes/ResourceLoaderTemplateModule.php
1 file changed, 10 insertions(+), 15 deletions(-)

Approvals:
  Spage: Looks good to me, but someone else must approve
  Jdlrobson: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/ResourceLoaderTemplateModule.php 
b/includes/ResourceLoaderTemplateModule.php
index a7de734..a976f15 100644
--- a/includes/ResourceLoaderTemplateModule.php
+++ b/includes/ResourceLoaderTemplateModule.php
@@ -160,22 +160,17 @@
 */
public function getScriptURLsForDebug( ResourceLoaderContext $context ) 
{
if ( $this-hasParsedMessages || $this-hasTemplates ) {
+   $derivative = new DerivativeResourceLoaderContext( 
$context );
+   $derivative-setDebug( true );
+   $derivative-setModules( array( $this-getName() ) );
+   // @todo FIXME: Make this templates and update
+   // makeModuleResponse so that it only outputs template 
code.
+   // When this is done you can merge with parent array and
+   // retain file names.
+   $derivative-setOnly( 'scripts' );
+   $rl = $derivative-getResourceLoader();
$urls = array(
-   ResourceLoader::makeLoaderURL(
-   array( $this-getName() ),
-   $context-getLanguage(),
-   $context-getSkin(),
-   $context-getUser(),
-   $context-getVersion(),
-   true, // debug
-   // @todo FIXME: Make this templates and 
update
-   // makeModuleResponse so that it only 
outputs template code.
-   // When this is done you can merge with 
parent array and
-   // retain file names.
-   'scripts', // only
-   $context-getRequest()-getBool( 
'printable' ),
-   $context-getRequest()-getBool( 
'handheld' )
-   ),
+   $rl-createLoaderURL( $this-getSource(), 
$derivative ),
);
} else {
$urls = parent::getScriptURLsForDebug( $context );

-- 
To view, visit https://gerrit.wikimedia.org/r/149796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Id8acfb5a233b6bdb6d092c3e166575756bc0fa5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mantle
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: JGonera jgon...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Spage sp...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] Don't use deprecated ResourceLoader::makeLoaderURL - change (mediawiki...Mantle)

2014-07-27 Thread Legoktm (Code Review) 
Legoktm has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/149796

Change subject: Don't use deprecated ResourceLoader::makeLoaderURL
..

Don't use deprecated ResourceLoader::makeLoaderURL

Change-Id: Id8acfb5a233b6bdb6d092c3e166575756bc0fa5b
---
M includes/ResourceLoaderTemplateModule.php
1 file changed, 10 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Mantle 
refs/changes/96/149796/1

diff --git a/includes/ResourceLoaderTemplateModule.php 
b/includes/ResourceLoaderTemplateModule.php
index a7de734..a976f15 100644
--- a/includes/ResourceLoaderTemplateModule.php
+++ b/includes/ResourceLoaderTemplateModule.php
@@ -160,22 +160,17 @@
 */
public function getScriptURLsForDebug( ResourceLoaderContext $context ) 
{
if ( $this-hasParsedMessages || $this-hasTemplates ) {
+   $derivative = new DerivativeResourceLoaderContext( 
$context );
+   $derivative-setDebug( true );
+   $derivative-setModules( array( $this-getName() ) );
+   // @todo FIXME: Make this templates and update
+   // makeModuleResponse so that it only outputs template 
code.
+   // When this is done you can merge with parent array and
+   // retain file names.
+   $derivative-setOnly( 'scripts' );
+   $rl = $derivative-getResourceLoader();
$urls = array(
-   ResourceLoader::makeLoaderURL(
-   array( $this-getName() ),
-   $context-getLanguage(),
-   $context-getSkin(),
-   $context-getUser(),
-   $context-getVersion(),
-   true, // debug
-   // @todo FIXME: Make this templates and 
update
-   // makeModuleResponse so that it only 
outputs template code.
-   // When this is done you can merge with 
parent array and
-   // retain file names.
-   'scripts', // only
-   $context-getRequest()-getBool( 
'printable' ),
-   $context-getRequest()-getBool( 
'handheld' )
-   ),
+   $rl-createLoaderURL( $this-getSource(), 
$derivative ),
);
} else {
$urls = parent::getScriptURLsForDebug( $context );

-- 
To view, visit https://gerrit.wikimedia.org/r/149796
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Id8acfb5a233b6bdb6d092c3e166575756bc0fa5b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Mantle
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits