Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/187618
Change subject: Use css class instead of jquery show/hide
......................................................................
Use css class instead of jquery show/hide
* Dependent on ooui change Ibf7c99 *
Replace instances of .show() and .hide() with ooui 'hidden' class
to make performance better.
Bug: T87420
Change-Id: I3af8a322e88b7ba3364f350819d6dbcdc8b13270
---
M lib/ve
M modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.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/styles/dialogs/ve.ui.MWMediaDialog.css
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
11 files changed, 37 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/18/187618/1
diff --git a/lib/ve b/lib/ve
index e56f537..7209eba 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit e56f5372979164c54edfb4f5941000edeb34e6d9
+Subproject commit 7209eba00a5c7539ee93845838587676b1435109
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/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index 3b71853..eee45c1 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -186,7 +186,8 @@
// to target (visibly), only for us to hide it again 0ms later.
// Though we can't hide it by default because it needs visible
dimensions
// to compute stuff during setup.
- this.getToolbar().$bar.hide();
+ this.getToolbar().$bar
+ .addClass( 'oo-ui-element-hidden' );
this.getToolbar().$element
.addClass( 've-init-mw-viewPageTarget-toolbar' );
@@ -1240,9 +1241,10 @@
ve.init.mw.ViewPageTarget.prototype.showPageContent = function () {
$( '#bodyContent > .ve-init-mw-viewPageTarget-content' )
.removeClass( 've-init-mw-viewPageTarget-content' )
- .show()
+ .removeClass( 'oo-ui-element-hidden' )
.fadeTo( 0, 1 );
- $( '#t-print, #t-permalink, #p-coll-print_export, #t-cite' ).show();
+ $( '#t-print, #t-permalink, #p-coll-print_export, #t-cite' )
+ .removeClass( 'oo-ui-element-hidden' );
};
/**
@@ -1264,8 +1266,9 @@
ve.init.mw.ViewPageTarget.prototype.hidePageContent = function () {
$( '#bodyContent > :visible:not(#siteSub,.ve-ui-mwTocWidget)' )
.addClass( 've-init-mw-viewPageTarget-content' )
- .hide();
- $( '#t-print, #t-permalink, #p-coll-print_export, #t-cite' ).hide();
+ .addClass( 'oo-ui-element-hidden' );
+ $( '#t-print, #t-permalink, #p-coll-print_export, #t-cite' )
+ .addClass( 'oo-ui-element-hidden' );
};
/**
@@ -1280,7 +1283,7 @@
} );
}
- $( '#contentSub' ).show();
+ $( '#contentSub' ).removeClass( 'oo-ui-element-hidden' );
};
/**
@@ -1296,9 +1299,10 @@
.wrap( '<div>' )
.parent()
.data( 've.hideTableOfContents', true )
- .hide();
+ .addClass( 'oo-ui-element-hidden' );
- $( '#contentSub' ).hide();
+ $( '#contentSub' )
+ .addClass( 'oo-ui-element-hidden' );
};
/**
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 4665726..aea5ff7 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -1092,17 +1092,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.$element.addClass(
'oo-ui-element-hidden' );
// 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.$element.removeClass(
'oo-ui-element-hidden' );
dialog.search.query.setValue(
dialog.pageTitle );
dialog.search.queryMediaSources();
// Initialization
@@ -1162,7 +1162,7 @@
);
// Size widget
- this.sizeErrorLabel.$element.hide();
+ this.sizeErrorLabel.$element.addClass( 'oo-ui-element-hidden' );
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 4192ac7..87dffcb 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 25bddb7..df8c3fc 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/styles/dialogs/ve.ui.MWMediaDialog.css
b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWMediaDialog.css
index 4e7a301..54ac1ef 100644
--- a/modules/ve-mw/ui/styles/dialogs/ve.ui.MWMediaDialog.css
+++ b/modules/ve-mw/ui/styles/dialogs/ve.ui.MWMediaDialog.css
@@ -11,10 +11,6 @@
padding-right: 2em;
}
-.ve-ui-mwMediaDialog-panel-settings {
- display: none;
-}
-
.ve-ui-mwMediaDialog-panel-imageinfo-thumb {
text-align: center;
}
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index ad9e4bb..fc33c57 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' )
+ .addClass( 'oo-ui-element-hidden' );
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..a8bf60f 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.$element.addClass( 'oo-ui-element-hidden' );
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 ddeea8f..61b325b 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -42,8 +42,8 @@
this.$noItemsMessage = this.$( '<div>' )
.addClass( 've-ui-mwMediaSearchWidget-noresults' )
+ .addClass( 'oo-ui-element-hidden' )
.text( ve.msg( 'visualeditor-dialog-media-noresults' ) )
- .hide()
.appendTo( this.$query );
// Events
@@ -161,7 +161,8 @@
}
// Reset message
- this.$noItemsMessage.hide();
+ this.$noItemsMessage.addClass( 'oo-ui-element-hidden' );
+
// Abort previous promises if they are pending
this.resetPromises();
@@ -263,9 +264,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..94ac967 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWTocWidget.js
@@ -137,9 +137,9 @@
// 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();
+ this.$element.removeClass( 'oo-ui-element-hidden' );
} else {
- this.$element.hide();
+ this.$element.addClass( 'oo-ui-element-hidden' );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/187618
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3af8a322e88b7ba3364f350819d6dbcdc8b13270
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
