jenkins-bot has submitted this change and it was merged.
Change subject: Colors are backwards for flyout section link
......................................................................
Colors are backwards for flyout section link
Also make active section link not clickable
Change-Id: I7f391929382489e8bad5ab56fea9f2ef7b2978b0
---
M modules/overlay/ext.echo.overlay.js
M modules/overlay/ext.echo.overlay.less
M tests/qunit/overlay/test_ext.echo.overlay.js
3 files changed, 8 insertions(+), 5 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/overlay/ext.echo.overlay.js
b/modules/overlay/ext.echo.overlay.js
index 4bf63e7..302cfcb 100644
--- a/modules/overlay/ext.echo.overlay.js
+++ b/modules/overlay/ext.echo.overlay.js
@@ -292,12 +292,12 @@
$( '<a class="mw-ui-progressive">' )
.on( 'click', function() {
var $this = $( this );
- $ul.find( 'a' ).removeClass(
'mw-ui-active' ).addClass( 'mw-ui-quiet' );
- $this.addClass( 'mw-ui-active'
).removeClass( 'mw-ui-quiet');
+ $ul.find( 'a' ).removeClass(
'mw-ui-quiet' ).addClass( 'mw-ui-active' );
+ $this.addClass( 'mw-ui-quiet'
).removeClass( 'mw-ui-active');
self._showTabList( $this.data(
'tab' ) );
} )
.data( 'tab', echoTab )
- .addClass( echoTab.name ===
self._activeTab.name ? 'mw-ui-active' : 'mw-ui-quiet' )
+ .addClass( echoTab.name ===
self._activeTab.name ? 'mw-ui-quiet' : 'mw-ui-active' )
.text( label ).appendTo( $li );
} );
return $ul;
diff --git a/modules/overlay/ext.echo.overlay.less
b/modules/overlay/ext.echo.overlay.less
index 2131991..5a7a7b5 100644
--- a/modules/overlay/ext.echo.overlay.less
+++ b/modules/overlay/ext.echo.overlay.less
@@ -39,6 +39,9 @@
.mw-ui-progressive {
cursor: pointer;
+ &.mw-ui-quiet {
+ pointer-events: none;
+ }
}
a.mw-echo-grey-link {
diff --git a/tests/qunit/overlay/test_ext.echo.overlay.js
b/tests/qunit/overlay/test_ext.echo.overlay.js
index cf20e70..bc8f2e3 100644
--- a/tests/qunit/overlay/test_ext.echo.overlay.js
+++ b/tests/qunit/overlay/test_ext.echo.overlay.js
@@ -170,9 +170,9 @@
// switch to 2nd tab
$overlay.find( '.mw-echo-overlay-title li a' ).eq( 1 ).trigger(
'click' );
- assert.strictEqual( $tabs.eq( 0 ).hasClass( 'mw-ui-active' ),
+ assert.strictEqual( $tabs.eq( 0 ).hasClass( 'mw-ui-quiet' ),
false, 'First tab is now the selected tab.' );
- assert.strictEqual( $tabs.eq( 1 ).hasClass( 'mw-ui-active' ),
+ assert.strictEqual( $tabs.eq( 1 ).hasClass( 'mw-ui-quiet' ),
true, 'Second tab is now the selected tab.' );
assert.strictEqual( this.$badge.text(),
'0', 'The label is now set to 0.' );
--
To view, visit https://gerrit.wikimedia.org/r/159222
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7f391929382489e8bad5ab56fea9f2ef7b2978b0
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
