[MediaWiki-commits] [Gerrit] mediawiki/core[master]: RCFilters: Only apply excluded label to namespace items

2017-11-20 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/392179 )

Change subject: RCFilters: Only apply excluded label to namespace items
..


RCFilters: Only apply excluded label to namespace items

Bug: T180863
Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
1 file changed, 10 insertions(+), 2 deletions(-)

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



diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
index db43a53..97000d4 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
@@ -65,7 +65,11 @@
this.excludeLabel = new OO.ui.LabelWidget( {
label: mw.msg( 'rcfilters-filter-excluded' )
} );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
 
layout = new OO.ui.FieldLayout( this.checkboxWidget, {
label: $label,
@@ -133,7 +137,11 @@
this.checkboxWidget.setSelected( this.itemModel.isSelected() );
 
this.highlightButton.toggle( 
this.filtersViewModel.isHighlightEnabled() );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
};
 
/**

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 
Gerrit-Reviewer: Catrope 
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/core[master]: RCFilters: Only apply excluded label to namespace items

2017-11-17 Thread Mooeypoo (Code Review) 
Mooeypoo has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/392179 )

Change subject: RCFilters: Only apply excluded label to namespace items
..

RCFilters: Only apply excluded label to namespace items

Bug: T180863
Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
---
M resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
1 file changed, 10 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core 
refs/changes/79/392179/1

diff --git 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
index db43a53..97000d4 100644
--- 
a/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
+++ 
b/resources/src/mediawiki.rcfilters/ui/mw.rcfilters.ui.ItemMenuOptionWidget.js
@@ -65,7 +65,11 @@
this.excludeLabel = new OO.ui.LabelWidget( {
label: mw.msg( 'rcfilters-filter-excluded' )
} );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
 
layout = new OO.ui.FieldLayout( this.checkboxWidget, {
label: $label,
@@ -133,7 +137,11 @@
this.checkboxWidget.setSelected( this.itemModel.isSelected() );
 
this.highlightButton.toggle( 
this.filtersViewModel.isHighlightEnabled() );
-   this.excludeLabel.toggle( this.itemModel.isSelected() && 
this.invertModel.isSelected() );
+   this.excludeLabel.toggle(
+   this.itemModel.getGroupModel().getView() === 
'namespace' &&
+   this.itemModel.isSelected() &&
+   this.invertModel.isSelected()
+   );
};
 
/**

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I08db859c571b82ed4e4793d97b99100875ff1e23
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo 

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