wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-29 00:30:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make transclusion dialog "pending" while loading

Browse source 
Also, only allow animation of anything after things are ready

Depends on I5c45cc6 in oojs-ui

Change-Id: I2fa71a1d9a43db960aac4c1fad87eae96c898fad
This commit is contained in:
Trevor Parscal 2014-04-17 15:06:11 -07:00
parent 25d1ca0659
commit 062b2ed681
2 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -51,6 +51,8 @@ ve.ui.MWTemplateDialog.static.bookletLayoutConfig = {
*/
ve.ui.MWTemplateDialog.prototype.onTransclusionReady = function () {
this.loaded = true;
this.$element.addClass( 've-ui-mwTemplateDialog-ready' );
this.popPending();
};
/**
@ -343,6 +345,7 @@ ve.ui.MWTemplateDialog.prototype.setup = function ( data ) {
.load( ve.copy( this.transclusionNode.getAttribute( 'mw' ) ) );
}
promise.always( ve.bind( this.onTransclusionReady, this ) );
this.pushPending();
};
/**
@ -357,6 +360,7 @@ ve.ui.MWTemplateDialog.prototype.teardown = function ( data ) {
this.saveChanges();
}
this.$element.removeClass( 've-ui-mwTemplateDialog-ready' );
this.transclusion.disconnect( this );
this.transclusion.abortRequests();
this.transclusion = null;

11
modules/ve-mw/ui/styles/ve.ui.MWTransclusionDialog.css
View file

@ -35,11 +35,12 @@
top: 1.5em;
}
.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .oo-ui-fieldsetLayout > .oo-ui-labeledElement-label,
.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .oo-ui-fieldsetLayout > .oo-ui-iconedElement-icon,
.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .ve-ui-mwTransclusionDialog-removeButton,
.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .ve-ui-mwTemplatePage-more,
.ve-ui-mwTransclusionDialog .oo-ui-bookletLayout .ve-ui-mwParameterPage-more {
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout .oo-ui-fieldsetLayout > .oo-ui-labeledElement-label,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout .oo-ui-fieldsetLayout > .oo-ui-iconedElement-icon,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout .ve-ui-mwTransclusionDialog-removeButton,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout .ve-ui-mwTemplatePage-more,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout .ve-ui-mwParameterPage-more,
.ve-ui-mwTransclusionDialog.ve-ui-mwTemplateDialog-ready .oo-ui-bookletLayout > .oo-ui-gridLayout > .oo-ui-panelLayout {
-webkit-transition: all 250ms ease-in-out;
-moz-transition: all 250ms ease-in-out;
-o-transition: all 250ms ease-in-out;