jenkins-bot has submitted this change and it was merged.
Change subject: Remove unscoped .hidden class
......................................................................
Remove unscoped .hidden class
Use jQuery .hide .show .toggle methods instead
Change-Id: I4bf6e997619593f5e82ad2f376bad4e27fceea36
---
M modules/entrypoint/ext.cx.entrypoint.js
M modules/entrypoint/styles/ext.cx.entrypoint.less
M modules/source/ext.cx.source.selector.js
M modules/source/styles/ext.cx.source.selector.less
M modules/tools/ext.cx.tools.mt.js
M modules/tools/styles/ext.cx.tools.mt.less
6 files changed, 17 insertions(+), 34 deletions(-)
Approvals:
Jsahleen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/entrypoint/ext.cx.entrypoint.js
b/modules/entrypoint/ext.cx.entrypoint.js
index bb974ab..46f0a86 100644
--- a/modules/entrypoint/ext.cx.entrypoint.js
+++ b/modules/entrypoint/ext.cx.entrypoint.js
@@ -43,9 +43,7 @@
// Hide the dialog when clicking outside it
$( 'html' ).click( function () {
- if ( entryPoint.$dialog &&
!entryPoint.$dialog.hasClass( 'hidden' ) ) {
- entryPoint.hide();
- }
+ entryPoint.hide();
} );
// Open or close the dialog when clicking the link.
@@ -93,18 +91,14 @@
* Show or Hide the CX entry point dialog based on current state
*/
CXEntryPoint.prototype.toggle = function () {
- if ( this.$dialog.hasClass( 'hidden' ) ) {
- this.show();
- } else {
- this.hide();
- }
+ this.$dialog.toggle();
};
/**
* Show the entry point dialog
*/
CXEntryPoint.prototype.show = function () {
- this.$dialog.removeClass( 'hidden' );
+ this.$dialog.show();
this.position();
this.$titleInput.focus();
};
@@ -134,7 +128,7 @@
* Hide the entry point dialog.
*/
CXEntryPoint.prototype.hide = function () {
- this.$dialog.addClass( 'hidden' );
+ this.$dialog.hide();
};
/**
@@ -160,7 +154,8 @@
this.$dialog = $( '<div>' )
.prop( 'id', 'cx-entrypoint-dialog-' +
this.options.targetLanguage )
- .addClass( 'cx-entrypoint-dialog hidden' );
+ .addClass( 'cx-entrypoint-dialog' )
+ .hide();
this.$closeIcon = $( '<span>' )
.addClass( 'icon-close' );
diff --git a/modules/entrypoint/styles/ext.cx.entrypoint.less
b/modules/entrypoint/styles/ext.cx.entrypoint.less
index 70a7cef..256cd48 100644
--- a/modules/entrypoint/styles/ext.cx.entrypoint.less
+++ b/modules/entrypoint/styles/ext.cx.entrypoint.less
@@ -1,11 +1,6 @@
@import "../../base/styles/grid/agora-grid";
@import "mediawiki.mixins";
-/* TODO remove when the grid is updated */
-.hidden {
- display: none;
-}
-
.cx-entrypoint-dialog {
.mw-ui-grid;
.mw-ui-one-third;
diff --git a/modules/source/ext.cx.source.selector.js
b/modules/source/ext.cx.source.selector.js
index 702ff31..7038e80 100644
--- a/modules/source/ext.cx.source.selector.js
+++ b/modules/source/ext.cx.source.selector.js
@@ -458,7 +458,7 @@
* Show the CXSourceSelector dialog
*/
CXSourceSelector.prototype.show = function () {
- this.$dialog.removeClass( 'hidden' );
+ this.$dialog.show();
this.position();
};
@@ -509,7 +509,7 @@
* Hide the entry point dialog.
*/
CXSourceSelector.prototype.hide = function () {
- this.$dialog.addClass( 'hidden' );
+ this.$dialog.hide();
};
/**
@@ -543,7 +543,8 @@
index;
this.$dialog = $( '<div>' )
- .addClass( 'cx-sourceselector-dialog hidden' );
+ .addClass( 'cx-sourceselector-dialog' )
+ .hide();
$heading = $( '<div>' ).addClass(
'cx-sourceselector-dialog__heading' )
.text( mw.msg(
'cx-sourceselector-dialog-new-translation' ) );
diff --git a/modules/source/styles/ext.cx.source.selector.less
b/modules/source/styles/ext.cx.source.selector.less
index ef72d5a..9573cfc 100644
--- a/modules/source/styles/ext.cx.source.selector.less
+++ b/modules/source/styles/ext.cx.source.selector.less
@@ -1,10 +1,6 @@
@import "../../base/styles/grid/agora-grid";
@import "mediawiki.mixins";
-.hidden {
- display: none;
-}
-
.cx-sourceselector-dialog {
.mw-ui-grid;
.mw-ui-item;
diff --git a/modules/tools/ext.cx.tools.mt.js b/modules/tools/ext.cx.tools.mt.js
index 3dae0e4..41e9ba0 100644
--- a/modules/tools/ext.cx.tools.mt.js
+++ b/modules/tools/ext.cx.tools.mt.js
@@ -296,7 +296,7 @@
var $providerItem = $( '#' + providerIdPrefix + providerId );
// Hide the menu
- this.$providersMenu.addClass( 'hidden' );
+ this.$providersMenu.hide();
// Mark the selected item
this.$providersMenu.find( 'li' ).removeClass( 'selected' );
@@ -326,7 +326,8 @@
cxMtCard = this;
this.$providersMenu = $( '<ul>' )
- .addClass( 'card__providers-menu hidden' );
+ .addClass( 'card__providers-menu' )
+ .hide();
// Add available machine translation engines to the menu
for ( provider in MTControlCard.providers ) {
@@ -347,7 +348,7 @@
this.$providerSelectorTrigger
.on( 'click', function ( e ) {
- cxMtCard.$providersMenu.toggleClass( 'hidden' );
+ cxMtCard.$providersMenu.toggle();
e.stopPropagation();
} )
.after( this.$providersMenu );
@@ -355,7 +356,7 @@
// Hide the dropdown on clicking outside of it
$( 'html' ).on( 'click', function ( e ) {
if ( !e.isDefaultPrevented() ) {
- cxMtCard.$providersMenu.addClass( 'hidden' );
+ cxMtCard.$providersMenu.hide();
}
} );
};
@@ -414,9 +415,9 @@
provider === sourceMT ||
provider === noMT
) {
- this.actions.$restore.addClass( 'hidden' );
+ this.actions.$restore.hide();
} else {
- this.actions.$restore.removeClass( 'hidden' );
+ this.actions.$restore.show();
}
if ( state === 'empty' ) {
diff --git a/modules/tools/styles/ext.cx.tools.mt.less
b/modules/tools/styles/ext.cx.tools.mt.less
index 7f72ab5..f586ca6 100644
--- a/modules/tools/styles/ext.cx.tools.mt.less
+++ b/modules/tools/styles/ext.cx.tools.mt.less
@@ -1,11 +1,6 @@
@import "../../base/styles/grid/agora-grid";
@import "mediawiki.mixins";
-/* TODO remove when the grid is updated */
-.hidden {
- display: none;
-}
-
.card.mt {
.card__title-row {
.mw-ui-item;
--
To view, visit https://gerrit.wikimedia.org/r/173245
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4bf6e997619593f5e82ad2f376bad4e27fceea36
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh <[email protected]>
Gerrit-Reviewer: Jsahleen <[email protected]>
Gerrit-Reviewer: Nikerabbit <[email protected]>
Gerrit-Reviewer: Santhosh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
