[MediaWiki-commits] [Gerrit] Move commons category to beta - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Move commons category to beta
..


Move commons category to beta

Bug: T100717
Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a
---
M includes/Resources.php
M includes/skins/SkinMinervaAlpha.php
M includes/skins/SkinMinervaBeta.php
R resources/skins.minerva.beta.scripts/commonsCategory.js
4 files changed, 6 insertions(+), 6 deletions(-)

Approvals:
  Bmansurov: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Resources.php b/includes/Resources.php
index bf0a5a2..ec87e99 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1757,6 +1757,10 @@
),
'scripts' => array(
'resources/skins.minerva.beta.scripts/bannerImage.js',
+   
'resources/skins.minerva.beta.scripts/commonsCategory.js',
+   ),
+   'messages' => array(
+   'mobile-frontend-commons-category-view',
),
),
// By mode. This should only ever be loaded in Minerva skin.
@@ -1766,13 +1770,9 @@
// Feature modules that should be loaded in alpha 
should be listed below here.
'mobile.hovercards',
),
-   'messages' => array(
-   'mobile-frontend-commons-category-view',
-   ),
'scripts' => array(
-   
'resources/skins.minerva.alpha.scripts/commonsCategory.js',
'resources/skins.minerva.alpha.scripts/hovercards.js',
-   )
+   ),
),
'tablet.scripts' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
diff --git a/includes/skins/SkinMinervaAlpha.php 
b/includes/skins/SkinMinervaAlpha.php
index d17f623..df119e7 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -52,7 +52,6 @@
 
$vars = parent::getSkinConfigVariables();
$vars['wgMFShowRedLinks'] = true;
-   $vars['wgMFImagesCategory'] = $this->getOutput()->getProperty( 
'wgMFImagesCategory' );
 
return $vars;
}
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index c75982f..dc5f65e 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -29,6 +29,7 @@
public function getSkinConfigVariables() {
$vars = parent::getSkinConfigVariables();
$vars['wgMFDescription'] = $this->getOutput()->getProperty( 
'wgMFDescription' );
+   $vars['wgMFImagesCategory'] = $this->getOutput()->getProperty( 
'wgMFImagesCategory' );
 
return $vars;
}
diff --git a/resources/skins.minerva.alpha.scripts/commonsCategory.js 
b/resources/skins.minerva.beta.scripts/commonsCategory.js
similarity index 100%
rename from resources/skins.minerva.alpha.scripts/commonsCategory.js
rename to resources/skins.minerva.beta.scripts/commonsCategory.js

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a
Gerrit-PatchSet: 16
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson 
Gerrit-Reviewer: Bmansurov 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] Move commons category to beta - change (mediawiki...MobileFrontend)

[Jdlrobson (Code Review)]

Jdlrobson has uploaded a new change for review.

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

Change subject: Move commons category to beta
..

Move commons category to beta

Bug: T100717
Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a
---
M includes/Resources.php
M includes/skins/SkinMinervaAlpha.php
M includes/skins/SkinMinervaBeta.php
3 files changed, 5 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/12/231412/1

diff --git a/includes/Resources.php b/includes/Resources.php
index aea855e..e59f4a1 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1785,6 +1785,10 @@
),
'scripts' = array(
'resources/skins.minerva.beta.scripts/bannerImage.js',
+   
'resources/skins.minerva.alpha.scripts/commonsCategory.js',
+   ),
+   'messages' = array(
+   'mobile-frontend-commons-category-view',
),
),
// By mode. This should only ever be loaded in Minerva skin.
@@ -1795,12 +1799,6 @@
'mobile.errorReport',
'mobile.quickLookup',
),
-   'messages' = array(
-   'mobile-frontend-commons-category-view',
-   ),
-   'scripts' = array(
-   
'resources/skins.minerva.alpha.scripts/commonsCategory.js',
-   )
),
'tablet.scripts' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
diff --git a/includes/skins/SkinMinervaAlpha.php 
b/includes/skins/SkinMinervaAlpha.php
index d17f623..df119e7 100644
--- a/includes/skins/SkinMinervaAlpha.php
+++ b/includes/skins/SkinMinervaAlpha.php
@@ -52,7 +52,6 @@
 
$vars = parent::getSkinConfigVariables();
$vars['wgMFShowRedLinks'] = true;
-   $vars['wgMFImagesCategory'] = $this-getOutput()-getProperty( 
'wgMFImagesCategory' );
 
return $vars;
}
diff --git a/includes/skins/SkinMinervaBeta.php 
b/includes/skins/SkinMinervaBeta.php
index c75982f..dc5f65e 100644
--- a/includes/skins/SkinMinervaBeta.php
+++ b/includes/skins/SkinMinervaBeta.php
@@ -29,6 +29,7 @@
public function getSkinConfigVariables() {
$vars = parent::getSkinConfigVariables();
$vars['wgMFDescription'] = $this-getOutput()-getProperty( 
'wgMFDescription' );
+   $vars['wgMFImagesCategory'] = $this-getOutput()-getProperty( 
'wgMFImagesCategory' );
 
return $vars;
}

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2cd815255eb2be655cb20abf95891bb4ae247e1a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

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