Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64086
Change subject: (bug 42837) AFT uses dangerously generic class names like
'buttons'
......................................................................
(bug 42837) AFT uses dangerously generic class names like 'buttons'
Remove temp double classnames intended to bridge page output vs JS/CSS caches
Bug: 42837
Change-Id: Ic45d1816375e2ecf3a385b3367b729f31c8bc28b
---
M ArticleFeedbackv5.render.php
M SpecialArticleFeedbackv5.php
M SpecialArticleFeedbackv5Watchlist.php
M modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
M modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
7 files changed, 7 insertions(+), 33 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ArticleFeedbackv5
refs/changes/86/64086/1
diff --git a/ArticleFeedbackv5.render.php b/ArticleFeedbackv5.render.php
index 989a6de..7ddb211 100644
--- a/ArticleFeedbackv5.render.php
+++ b/ArticleFeedbackv5.render.php
@@ -671,7 +671,6 @@
$aclass .= '
articleFeedbackv5-has-abuse-flags';
}
if ( $record->aft_flag >=
$wgArticleFeedbackv5AbusiveThreshold ) {
- $aclass .= ' abusive'; /** @deprecated
*/
$aclass .= ' articleFeedbackv5-abusive';
}
@@ -755,7 +754,7 @@
$abuseLink . $abuseStats
) .
$ownPost .
- Html::element( 'div', array( 'class' => 'clear
articleFeedbackv5-clear' ) ) /** @deprecated: get rid of the non-prefixed clear
*/
+ Html::element( 'div', array( 'class' =>
'articleFeedbackv5-clear' ) )
);
}
diff --git a/SpecialArticleFeedbackv5.php b/SpecialArticleFeedbackv5.php
index 3fe3378..3bc72a1 100644
--- a/SpecialArticleFeedbackv5.php
+++ b/SpecialArticleFeedbackv5.php
@@ -396,11 +396,10 @@
$found = ArticleFeedbackv5Model::getCountFound(
$this->pageId ) / ( $totalCount ?: 1 ) * 100;
if ( $found ) {
$class = $found >= 50 ?
'articleFeedbackv5-positive' : 'articleFeedbackv5-negative';
- $class .= $found >= 50 ? ' positive' : '
negative'; /** @deprecated */
$span = Html::rawElement(
'span',
- array( 'class' => "stat-marker
articleFeedbackv5-stat-marker $class" ), /** @deprecated: get rid of the
non-prefixed stat-marker */
+ array( 'class' =>
"articleFeedbackv5-stat-marker $class" ),
$this->msg( 'percent', round( $found )
)->escaped()
);
@@ -549,7 +548,7 @@
),
$this->msg(
'articlefeedbackv5-special-refresh' )->text()
) .
- Html::element( 'div', array( 'class' => 'clear
articleFeedbackv5-clear' ) ) /** @deprecated: get rid of the non-prefixed clear
*/
+ Html::element( 'div', array( 'class' =>
'articleFeedbackv5-clear' ) )
) .
$centralPageLink;
}
@@ -568,7 +567,6 @@
$class = 'articleFeedbackv5-filter-link';
$class .= ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' );
- $class .= ( $this->startingFilter == $filter ? '
filter-active' : '' ); /** @deprecated */
$filterLabels[$filter] =
Html::rawElement(
diff --git a/SpecialArticleFeedbackv5Watchlist.php
b/SpecialArticleFeedbackv5Watchlist.php
index 9d2be43..94a6724 100644
--- a/SpecialArticleFeedbackv5Watchlist.php
+++ b/SpecialArticleFeedbackv5Watchlist.php
@@ -106,7 +106,6 @@
foreach ( array( 'featured', 'unreviewed' ) as $filter ) {
$class = 'articleFeedbackv5-filter-link';
$class .= ( $this->startingFilter == $filter ? '
articleFeedbackv5-filter-active' : '' );
- $class .= ( $this->startingFilter == $filter ? '
filter-active' : '' ); /** @deprecated */
$filterLabels[$filter] =
Html::rawElement(
diff --git a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
index 89fd687..d1e24a4 100644
--- a/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
+++ b/modules/ext.articleFeedbackv5/ext.articleFeedbackv5.dashboard.css
@@ -64,19 +64,16 @@
margin: 15px 0 5px 0;
line-height: 28px;
}
-#articleFeedbackv5-percent-found-wrap .stat-marker, /** @deprecated */
#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-stat-marker {
font-weight: bold;
padding: 11px 0 8px 40px;
}
-#articleFeedbackv5-percent-found-wrap .positive, /** @deprecated */
#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-positive {
/* @embed */
background-image: url(images/large-positive.png);
background-repeat: no-repeat;
background-position: left;
}
-#articleFeedbackv5-percent-found-wrap .negative, /** @deprecated */
#articleFeedbackv5-percent-found-wrap .articleFeedbackv5-negative {
/* @embed */
background-image: url(images/large-negative.png);
@@ -134,9 +131,6 @@
margin-right: 10px;
font-weight: bold;
}
-.filter-active, /** @deprecated */
-.filter-active:hover, /** @deprecated */
-.filter-link.articleFeedbackv5-filter-active:hover, /** @deprecated */
.articleFeedbackv5-filter-active,
.articleFeedbackv5-filter-active:hover,
.articleFeedbackv5-filter-link.articleFeedbackv5-filter-active:hover {
@@ -146,8 +140,6 @@
background-position: bottom left;
background-repeat: repeat-x;
}
-.filter-active, /** @deprecated */
-.filter-active:visited, /** @deprecated */
.articleFeedbackv5-filter-active,
.articleFeedbackv5-filter-active:visited {
color: #000;
@@ -159,7 +151,6 @@
padding: 0 5px;
}
#articleFeedbackv5-select-wrapper:hover,
-#articleFeedbackv5-select-wrapper.filter-active, /** @deprecated */
#articleFeedbackv5-select-wrapper.articleFeedbackv5-filter-active {
/* @embed */
background-image: url(images/bg-feedbackpage-header-on.png);
@@ -171,8 +162,6 @@
margin-right: 0px;
color: #444444;
}
-.filter-active #articleFeedbackv5-filter-select, /** @deprecated */
-.filter-active #articleFeedbackv5-sort-select, /** @deprecated */
.filter-active #articleFeedbackv5-filter-select,
.filter-active #articleFeedbackv5-sort-select {
color: black;
diff --git a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
index ff459ec..fe6aff3 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.css
@@ -435,7 +435,6 @@
/*---===<<< Sean's Version 5 Styles >>>===---*/
-.clear /** @deprecated */
.articleFeedbackv5-clear {
display: block !important;
height: 0 !important;
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
index 846ae19..8800fcf 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.css
@@ -223,7 +223,6 @@
color: #888;
display: none;
}
-.articleFeedbackv5-abuse-count.abusive, /** @deprecated */
.articleFeedbackv5-abuse-count.articleFeedbackv5-abusive {
color: #832831;
}
@@ -901,7 +900,6 @@
line-height: 1.5em;
}
-.clear, /** @deprecated */
.articleFeedbackv5-clear {
display: block !important;
height: 0 !important;
diff --git
a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
index f02fd00..e324aa9 100644
--- a/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
+++ b/modules/jquery.articleFeedbackv5/jquery.articleFeedbackv5.special.js
@@ -513,22 +513,14 @@
$.articleFeedbackv5special.userType );
// update filter in select (if present) & text-links (if any)
- $( '#articleFeedbackv5-select-wrapper' )
- .removeClass( 'filter-active' ) /** @deprecated */
- .removeClass( 'articleFeedbackv5-filter-active' );
- $( '.articleFeedbackv5-filter-link' )
- .removeClass( 'filter-active' ) /** @deprecated */
- .removeClass( 'articleFeedbackv5-filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' ).removeClass(
'articleFeedbackv5-filter-active' );
+ $( '.articleFeedbackv5-filter-link' ).removeClass(
'articleFeedbackv5-filter-active' );
if ( $( '#articleFeedbackv5-filter-select option[value=' + id +
']' ).length > 0 ) {
- $( '#articleFeedbackv5-select-wrapper' )
- .addClass( 'filter-active' ) /** @deprecated */
- .addClass( 'articleFeedbackv5-filter-active' );
+ $( '#articleFeedbackv5-select-wrapper' ).addClass(
'articleFeedbackv5-filter-active' );
} else {
$( '#articleFeedbackv5-filter-select' ).val( '' );
}
- $( '#articleFeedbackv5-special-filter-' + id)
- .addClass( 'filter-active' ) /** @deprecated */
- .addClass( 'articleFeedbackv5-filter-active' );
+ $( '#articleFeedbackv5-special-filter-' + id ).addClass(
'articleFeedbackv5-filter-active' );
};
// }}}
--
To view, visit https://gerrit.wikimedia.org/r/64086
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic45d1816375e2ecf3a385b3367b729f31c8bc28b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ArticleFeedbackv5
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
