[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fixes for display of main Cargo CSS, JS
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/395813 )
Change subject: Fixes for display of main Cargo CSS, JS
..
Fixes for display of main Cargo CSS, JS
Change-Id: Iaceb32d40cfdec9d6b66046bf3f1891c3404b137
---
M Cargo.php
M extension.json
M formats/CargoTableFormat.php
3 files changed, 2 insertions(+), 4 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Cargo.php b/Cargo.php
index 5ccba75..4e92ccf 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -177,7 +177,6 @@
'show',
'hide'
),
- 'position' => 'top',
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
),
diff --git a/extension.json b/extension.json
index 5a0debe..a503672 100644
--- a/extension.json
+++ b/extension.json
@@ -119,8 +119,7 @@
"messages": [
"show",
"hide"
- ],
- "position": "top"
+ ]
},
"ext.cargo.recreatedata": {
"scripts": [
diff --git a/formats/CargoTableFormat.php b/formats/CargoTableFormat.php
index b21628f..37f8fdf 100644
--- a/formats/CargoTableFormat.php
+++ b/formats/CargoTableFormat.php
@@ -59,7 +59,7 @@
* @return string HTML
*/
function display( $valuesTable, $formattedValuesTable,
$fieldDescriptions, $displayParams ) {
- $this->mOutput->addModuleStyles( 'ext.cargo.main' );
+ $this->mOutput->addModules( 'ext.cargo.main' );
$mergeSimilarCells = false;
if ( array_key_exists( 'merge similar cells', $displayParams )
) {
--
To view, visit https://gerrit.wikimedia.org/r/395813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaceb32d40cfdec9d6b66046bf3f1891c3404b137
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Cargo[master]: Fixes for display of main Cargo CSS, JS
Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/395813 )
Change subject: Fixes for display of main Cargo CSS, JS
..
Fixes for display of main Cargo CSS, JS
Change-Id: Iaceb32d40cfdec9d6b66046bf3f1891c3404b137
---
M Cargo.php
M extension.json
M formats/CargoTableFormat.php
3 files changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Cargo
refs/changes/13/395813/2
diff --git a/Cargo.php b/Cargo.php
index 5ccba75..4e92ccf 100644
--- a/Cargo.php
+++ b/Cargo.php
@@ -177,7 +177,6 @@
'show',
'hide'
),
- 'position' => 'top',
'localBasePath' => __DIR__,
'remoteExtPath' => 'Cargo'
),
diff --git a/extension.json b/extension.json
index 5a0debe..a503672 100644
--- a/extension.json
+++ b/extension.json
@@ -119,8 +119,7 @@
"messages": [
"show",
"hide"
- ],
- "position": "top"
+ ]
},
"ext.cargo.recreatedata": {
"scripts": [
diff --git a/formats/CargoTableFormat.php b/formats/CargoTableFormat.php
index b21628f..37f8fdf 100644
--- a/formats/CargoTableFormat.php
+++ b/formats/CargoTableFormat.php
@@ -59,7 +59,7 @@
* @return string HTML
*/
function display( $valuesTable, $formattedValuesTable,
$fieldDescriptions, $displayParams ) {
- $this->mOutput->addModuleStyles( 'ext.cargo.main' );
+ $this->mOutput->addModules( 'ext.cargo.main' );
$mergeSimilarCells = false;
if ( array_key_exists( 'merge similar cells', $displayParams )
) {
--
To view, visit https://gerrit.wikimedia.org/r/395813
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaceb32d40cfdec9d6b66046bf3f1891c3404b137
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Cargo
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
