wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-24 18:58:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix loading bar opacity"

Browse source
This commit is contained in:
jenkins-bot 2016-06-07 14:07:48 +00:00 committed by Gerrit Code Review
parent 52655bdfc5 b33cd5d8f1
commit 6a6d3b9368
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/ve-mw/init/styles/ve.init.mw.DesktopArticleTarget.init.css
View file

@ -13,7 +13,7 @@
* Reading | ve-available
* Loading editor | ve-available ve-activated ve-loading
* - mw.DesktopArticleTarget.css is loaded
* Activate editor | ve-available ve-activated ve-activating
* Activate editor | ve-available ve-activated ve-loading ve-activating
* Active | ve-available ve-activated ve-active
* Deactivate editor | ve-available ve-deactivating
* Deactivated | ve-available

8
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.init.js
View file

@ -246,12 +246,18 @@
targetPromise = targetPromise || getTarget();
targetPromise
.then( function ( target ) {
var activatePromise;
incrementLoadingProgress();
target.on( 'deactivate', function () {
active = false;
} );
target.on( 'loadError', handleLoadFailure );
return target.activate( dataPromise );
// Detach the loading bar for activation so it doesn't get moved around
// and altered, re-attach immediately after
init.$loading.detach();
activatePromise = target.activate( dataPromise );
$( '#content' ).prepend( init.$loading );
return activatePromise;
} )
.then( function () {
ve.track( 'mwedit.ready' );

2
modules/ve-mw/init/targets/ve.init.mw.DesktopArticleTarget.js
View file

@ -467,7 +467,7 @@ ve.init.mw.DesktopArticleTarget.prototype.activate = function ( dataPromise ) {
this.activatingDeferred = $.Deferred();
this.toolbarSetupDeferred = $.Deferred();
$( 'html' ).removeClass( 've-loading' ).addClass( 've-activating' );
$( 'html' ).addClass( 've-activating' );
$.when( this.activatingDeferred, this.toolbarSetupDeferred ).done( function () {
target.afterActivate();
} ).fail( function () {