jenkins-bot has submitted this change and it was merged.
Change subject: Use css class instead of jquery show/hide
......................................................................
Use css class instead of jquery show/hide
Replace instances of .show() and .hide() with ooui 'hidden' class
to make performance better.
Related ooui change: Ibf7c99aa4aad
Bug: T87420
Bug: T88736
Change-Id: I3af8a322e88b7ba3364f350819d6dbcdc8b13270
(cherry picked from commit 8a53b2cd07ec7819c6c22800ea1d24664a3a5ecc)
---
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
8 files changed, 25 insertions(+), 25 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
index 3211b12..f0476ef 100644
--- a/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
+++ b/modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
@@ -143,8 +143,7 @@
}
}
if ( this.$caption ) {
- // Don't use show() as it sets display to block, overriding the
stylesheet.
- this.$caption.css( 'display', this.captionVisible ? '' : 'none'
);
+ this.$caption.toggleClass( 'oo-ui-element-hidden',
!this.captionVisible );
}
};
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index adf98e4..697c138 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1098,17 +1098,17 @@
// The filerepo promise will be sent to the API
// only once per session so this will be
resolved
// every time the search panel reloads
- this.$spinner.show();
- this.search.$element.hide();
+ this.$spinner.removeClass(
'oo-ui-element-hidden' );
+ this.search.toggle( false );
// Get the repos from the API first
// The ajax request will only be done once per
session
dialog.getFileRepos().done( function ( repos ) {
dialog.search.setSources( repos );
// Done, hide the spinner
- dialog.$spinner.hide();
+ dialog.$spinner.addClass(
'oo-ui-element-hidden' );
// Show the search and query the media
sources
- dialog.search.$element.show();
+ dialog.search.toggle( true );
dialog.search.query.setValue(
dialog.pageTitle );
dialog.search.queryMediaSources();
// Initialization
@@ -1168,7 +1168,7 @@
);
// Size widget
- this.sizeErrorLabel.$element.hide();
+ this.sizeErrorLabel.toggle( false );
this.sizeWidget.setScalable( this.imageModel.getScalable() );
this.sizeWidget.connect( this, {
changeSizeType: 'checkChanged',
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 63bfc22..81e8f38 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -267,13 +267,13 @@
group = this.getFragment().getDocument().getInternalList()
.getNodeGroup( this.referenceModel.getListGroup() );
if ( group && group.keyedNodes[this.referenceModel.getListKey()].length
> 1 ) {
- this.$reuseWarning.show();
+ this.$reuseWarning.removeClass( 'oo-ui-element-hidden' );
this.$reuseWarningText.text( mw.msg(
'visualeditor-dialog-reference-editing-reused',
group.keyedNodes[this.referenceModel.getListKey()].length
) );
} else {
- this.$reuseWarning.hide();
+ this.$reuseWarning.addClass( 'oo-ui-element-hidden' );
}
return this;
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
index 1f1e9a0..551813b 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
@@ -203,20 +203,22 @@
if ( !currentEditSummaryWikitext ||
currentEditSummaryWikitext.trim() === '' ) {
// Don't bother with an API request for
an empty summary
- this.$reviewEditSummary.parent().hide();
+
this.$reviewEditSummary.parent().addClass( 'oo-ui-element-hidden' );
} else {
-
this.$reviewEditSummary.parent().show().addClass( 'mw-ajax-loader' );
+ this.$reviewEditSummary.parent()
+ .removeClass(
'oo-ui-element-hidden' )
+ .addClass( 'mw-ajax-loader' );
this.editSummaryXhr = new
mw.Api().post( {
action: 'parse',
summary:
currentEditSummaryWikitext
} ).done( function ( result ) {
if (
result.parse.parsedsummary['*'] === '' ) {
-
dialog.$reviewEditSummary.parent().hide();
+
dialog.$reviewEditSummary.parent().addClass( 'oo-ui-element-hidden' );
} else {
dialog.$reviewEditSummary.html( ve.msg( 'parentheses',
result.parse.parsedsummary['*'] ) );
}
} ).fail( function () {
-
dialog.$reviewEditSummary.parent().hide();
+
dialog.$reviewEditSummary.parent().addClass( 'oo-ui-element-hidden' );
} ).always( function () {
dialog.$reviewEditSummary.parent().removeClass( 'mw-ajax-loader' );
} );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index 74c2c26..7ab676c 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -48,7 +48,9 @@
this.$sortKeyForm.on( 'submit', this.onSortKeySubmit.bind( this ) );
// Initialization
- this.$element.addClass( 've-ui-mwCategoryPopupWidget' ).hide();
+ this.$element
+ .addClass( 've-ui-mwCategoryPopupWidget' );
+ this.toggle( false );
this.$title
.addClass( 've-ui-mwCategoryPopupWidget-title oo-ui-icon-tag' )
.text( ve.msg( 'visualeditor-dialog-meta-categories-category' )
);
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
index f555503..62d0421 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
@@ -55,7 +55,7 @@
label: ve.msg( 'visualeditor-dialog-media-searchselect' ),
icon: 'check'
} );
- this.selectButton.$element.hide();
+ this.selectButton.toggle( false );
this.$element.prepend( this.selectButton.$element );
};
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 90f540d..94a5744 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -42,9 +42,8 @@
this.rows = [];
this.$noItemsMessage = this.$( '<div>' )
- .addClass( 've-ui-mwMediaSearchWidget-noresults' )
+ .addClass( 've-ui-mwMediaSearchWidget-noresults
oo-ui-element-hidden' )
.text( ve.msg( 'visualeditor-dialog-media-noresults' ) )
- .hide()
.appendTo( this.$query );
// Events
@@ -168,7 +167,8 @@
}
// Reset message
- this.$noItemsMessage.hide();
+ this.$noItemsMessage.addClass( 'oo-ui-element-hidden' );
+
// Abort previous promises if they are pending
this.resetPromises();
@@ -270,9 +270,9 @@
this.query.popPending();
if ( this.results.getItems().length === 0 ) {
- this.$noItemsMessage.show();
+ this.$noItemsMessage.removeClass( 'oo-ui-element-hidden' );
} else {
- this.$noItemsMessage.hide();
+ this.$noItemsMessage.addClass( 'oo-ui-element-hidden' );
this.lazyLoadResults();
}
};
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
index 115200e..3979497 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
@@ -62,6 +62,7 @@
widget.toggle.$link.text( widget.toggle.hideMsg );
widget.toggle.open = true;
}
+ // FIXME: We should really use CSS here
widget.topics.$group.add( widget.$tempTopics ).slideToggle();
} );
@@ -136,11 +137,7 @@
ve.ui.MWTocWidget.prototype.hideOrShow = function () {
// In MediaWiki if __FORCETOC__ is anywhere TOC is always displayed
// ... Even if there is a __NOTOC__ in the article
- if ( !this.mwTOCDisable && ( this.mwTOCForce ||
this.topics.items.length >= 3 ) ) {
- this.$element.show();
- } else {
- this.$element.hide();
- }
+ this.toggle( !this.mwTOCDisable && ( this.mwTOCForce ||
this.topics.items.length >= 3 ) );
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/189144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3af8a322e88b7ba3364f350819d6dbcdc8b13270
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: wmf/1.25wmf16
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Catrope <[email protected]>
Gerrit-Reviewer: Mooeypoo <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
