Hello Jack Phoenix, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/379293
to review the following change.
Change subject: Revert "RCFilters: Don't remove mw-changeslist-line-prefix in
enhanced mode"
......................................................................
Revert "RCFilters: Don't remove mw-changeslist-line-prefix in enhanced mode"
Doesn't actually work.
This reverts commit 55c37be76bfb8e7d497201138a216b0406f67b8f.
Change-Id: Ib7141c1420df77e829d9e54ba65d73934394d48c
---
M resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
M
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
2 files changed, 8 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/93/379293/1
diff --git a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
index 6c8ebac..b4e3b0e 100644
--- a/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
+++ b/resources/src/mediawiki.rcfilters/styles/mw.rcfilters.mixins.less
@@ -51,7 +51,7 @@
.mw-rcfilters-ui-changesListWrapperWidget li&,
.mw-rcfilters-ui-changesListWrapperWidget & tr:first-child,
.mw-rcfilters-ui-changesListWrapperWidget
tr&.mw-rcfilters-ui-changesListWrapperWidget-enhanced-toplevel:not(.mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey)
td:not( :nth-child( -n+2 ) ),
- .mw-rcfilters-ui-changesListWrapperWidget
tr&.mw-rcfilters-ui-changesListWrapperWidget-enhanced-nested:not(.mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey)
td:not( :nth-child( -n+4 ) ) {
+ .mw-rcfilters-ui-changesListWrapperWidget
tr&.mw-rcfilters-ui-changesListWrapperWidget-enhanced-nested:not(.mw-rcfilters-ui-changesListWrapperWidget-enhanced-grey)
td:not( :nth-child( -n+3 ) ) {
background-color: @bgcolor;
}
}
diff --git
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
index 279e5be..429def4 100644
---
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@ -310,17 +310,14 @@
);
// We are adding and changing cells in a table that,
despite having nested rows,
- // is actually all one big table. To prevent the
highlights cell in the "nested"
- // rows from stretching out the cell with the flags and
timestamp in the top row,
- // we give the latter colspan=2. Then to make things
line up again, we add
- // an empty <td> to the "nested" rows.
-
- // Set colspan=2 on cell with flags and timestamp in
top row
+ // is actually all one big table. To do that right, we
want to remove the 'placeholder'
+ // cell from the top row, because we're actually adding
that placeholder in the children
+ // with the highlights.
+ $content.find( 'table.mw-enhanced-rc tr:first-child
td.mw-changeslist-line-prefix' )
+ .detach();
$content.find( 'table.mw-enhanced-rc tr:first-child
td.mw-enhanced-rc' )
.prop( 'colspan', '2' );
- // Add empty <td> to nested rows to compensate
- $enhancedNestedPagesCell.parent().prepend( $( '<td>' )
);
- // Add highlights cell to nested rows
+
$enhancedNestedPagesCell
.before(
$( '<td>' )
@@ -330,7 +327,7 @@
// We need to target the nested rows differently than
the top rows so that the
// LESS rules applies correctly. In top rows, the rule
should highlight all but
// the first 2 cells td:not( :nth-child( -n+2 ) and the
nested rows, the rule
- // should highlight all but the first 4 cells td:not(
:nth-child( -n+4 )
+ // should highlight all but the first 3 cells td:not(
:nth-child( -n+3 )
$enhancedNestedPagesCell
.closest( 'tr' )
.addClass(
'mw-rcfilters-ui-changesListWrapperWidget-enhanced-nested' );
--
To view, visit https://gerrit.wikimedia.org/r/379293
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib7141c1420df77e829d9e54ba65d73934394d48c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: wmf/1.30.0-wmf.19
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
