dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add hook for cleaning up data that depends on purged recentchanges rows"
[lhc/web/wiklou.git]
/
resources
/
src
/
mediawiki.rcfilters
/
ui
/
mw.rcfilters.ui.ChangesListWrapperWidget.js
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
f4a1807
..
843acce
100644
(file)
--- a/
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
+++ b/
resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ChangesListWrapperWidget.js
@@
-39,7
+39,10
@@
update: 'onModelUpdate'
} );
update: 'onModelUpdate'
} );
- this.$element.addClass( 'mw-rcfilters-ui-changesListWrapperWidget' );
+ this.$element
+ .addClass( 'mw-rcfilters-ui-changesListWrapperWidget' )
+ // We handle our own display/hide of the empty results message
+ .removeClass( 'mw-changeslist-empty' );
// Set up highlight containers
this.setupHighlightContainers( this.$element );
// Set up highlight containers
this.setupHighlightContainers( this.$element );
@@
-92,7
+95,6
@@
isEmpty = $changesListContent === 'NO_RESULTS';
this.$element.toggleClass( 'mw-changeslist', !isEmpty );
isEmpty = $changesListContent === 'NO_RESULTS';
this.$element.toggleClass( 'mw-changeslist', !isEmpty );
- this.$element.toggleClass( 'mw-changeslist-empty', isEmpty );
if ( isEmpty ) {
this.$changesListContent = null;
this.$element.empty();
if ( isEmpty ) {
this.$changesListContent = null;
this.$element.empty();
@@
-140,7
+142,8
@@
* @param {jQuery|string} $content The content of the updated changes list
*/
mw.rcfilters.ui.ChangesListWrapperWidget.prototype.setupHighlightContainers = function ( $content ) {
* @param {jQuery|string} $content The content of the updated changes list
*/
mw.rcfilters.ui.ChangesListWrapperWidget.prototype.setupHighlightContainers = function ( $content ) {
- var $highlights = $( '<div>' )
+ var uri = new mw.Uri(),
+ $highlights = $( '<div>' )
.addClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlights' )
.append(
$( '<div>' )
.addClass( 'mw-rcfilters-ui-changesListWrapperWidget-highlights' )
.append(
$( '<div>' )
@@
-161,7
+164,10
@@
);
} );
);
} );
- if ( Number( mw.user.options.get( 'usenewrc' ) ) ) {
+ if (
+ ( uri.query.enhanced !== undefined && Number( uri.query.enhanced ) ) ||
+ ( uri.query.enhanced === undefined && Number( mw.user.options.get( 'usenewrc' ) ) )
+ ) {
// Enhanced RC
$content.find( 'td.mw-enhanced-rc' )
.parent()
// Enhanced RC
$content.find( 'td.mw-enhanced-rc' )
.parent()