Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/192281
Change subject: mw.ViewPageTarget: Remove JS animations from transformPage()
......................................................................
mw.ViewPageTarget: Remove JS animations from transformPage()
Follows-up 62c1d64ad0.
* Remove '.mw-indicators' animation for opacity. Was a left-over from other
elements previously stripped in 62c1d64ad0.
* '#siteNotice' no longer slides. It's hidden at the same time as '#contentSub',
'#toc', and other elements. This is an annoying jump, and we should find a
way to do it consistently and in a performant manner.
* Fix state classes added in 62c1d64ad0. During deactivation, the ve-active
class was kept for too long. This created a temporary state in which ve-active
*and* ve-deactivating were applied. This was harmless as nothing ises the
've-deactivating' class yet.
* Leaving toolbar as-is for another commit.
Bug: T89543
Change-Id: Ide49f93c45a12f2c13eb4412a9a16a82fefeb43e
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
2 files changed, 11 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/81/192281/1
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
index 358b8e6..6474fbe 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget.css
@@ -15,6 +15,8 @@
*/
.ve-activated #toc,
+.ve-activated #siteNotice,
+.ve-activated .mw-indicators,
/* Most of bodyContent can be hidden as VE has an equivalent of most children
in ve-init-target (sibling of #bodyContent). However, we can't hide it
completely as subs should remain visible (for persistence with read mode),
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 a09959a..9f5dcd4 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -287,7 +287,7 @@
$( 'html' ).addClass( 've-activating ve-activated' );
this.activatingDeferred.always( function () {
- $( 'html' ).addClass( 've-active' ).removeClass(
've-activating' );
+ $( 'html' ).removeClass( 've-activating' ).addClass(
've-active' );
} );
this.bindHandlers();
@@ -368,7 +368,7 @@
}
this.deactivating = true;
- $( 'html' ).removeClass( 've-activated' ).addClass( 've-deactivating' );
+ $( 'html' ).addClass( 've-deactivating' ).removeClass( 've-activated
ve-active' );
// User interface changes
if ( this.elementsThatHadOurAccessKey ) {
this.elementsThatHadOurAccessKey.attr( 'accesskey', ve.msg(
'accesskey-save' ) );
@@ -409,7 +409,7 @@
target.deactivating = false;
target.activating = false;
target.activatingDeferred.reject();
- $( 'html' ).removeClass( 've-active ve-deactivating' );
+ $( 'html' ).removeClass( 've-deactivating' );
// Move remaining elements back out of the target
target.$element.parent().append( target.$element.children() );
@@ -1286,7 +1286,12 @@
*/
ve.init.mw.ViewPageTarget.prototype.tearDownToolbar = function () {
var target = this;
- return this.toolbar.$bar.slideUp( 'fast' ).promise().then( function () {
+ target.toolbar.$element.css( 'maxHeight', '' );
+ return $.Deferred( function ( deferred ) {
+ // The toolbar is transitioning out. Use timeout as safeguard.
+ target.toolbar.$bar.on( 'transitionend', deferred.resolve );
+ setTimeout( deferred.resolve, 5000 );
+ } ).then( function () {
target.toolbar.destroy();
target.toolbar = null;
} );
@@ -1338,15 +1343,6 @@
mw.hook( 've.activate' ).fire();
- // Hide site notice (if present)
- $( '#siteNotice:visible' )
- .addClass( 've-hide' )
- .slideUp( 'fast' );
- // Hide page status indicators (if present)
- $( '.mw-indicators' )
- .addClass( 've-hide' )
- .fadeOut( 'fast' );
-
// Push veaction=edit url in history (if not already. If we got here by
a veaction=edit
// permalink then it will be there already and the constructor called
#activate)
if ( !this.actFromPopState && history.pushState &&
this.currentUri.query.veaction !== 'edit' ) {
@@ -1372,13 +1368,6 @@
$( '#ca-view' ).addClass( 'selected' );
mw.hook( 've.deactivate' ).fire();
-
- // Make site notice visible again (if present)
- $( '#siteNotice.ve-hide' )
- .slideDown( 'fast' );
- // Make page status indicators visible again (if present)
- $( '.mw-indicators.ve-hide' )
- .fadeIn( 'fast' );
// Push non-veaction=edit url in history
if ( !this.actFromPopState && history.pushState ) {
--
To view, visit https://gerrit.wikimedia.org/r/192281
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide49f93c45a12f2c13eb4412a9a16a82fefeb43e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
