wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-09-26 19:56:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

mw.ViewPageTarget.init: Reduce duplication around getTarget() calls

Browse source 
De-duplicate the logic of:
* Call showLoading()
* Call getTarget()
* Call activate()
* Bind always(hideLoading)

Also use then() instead of done() on getTarget() so that failures
propagate to the always() handler. Previously the interface would
indefinitely be in a loading state if target fails to load.

Change-Id: I002322beaae64c0de96457eb56dbc68a5fc16369
This commit is contained in:
Timo Tijhof 2015-02-21 05:09:50 +00:00
parent c6dbdc92ea
commit a34ccc2f3b
1 changed files with 35 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
View file

@ -21,11 +21,25 @@
init, support, targetPromise, enable, userPrefEnabled,
plugins = [];
function showLoading() {
if ( !init.$loading ) {
init.$loading = $( '<div class="mw-viewPageTarget-loading"></div>' );
}
$( '#firstHeading' ).prepend( init.$loading );
}
function hideLoading() {
if ( init.$loading ) {
init.$loading.detach();
}
}
/**
* Use deferreds to avoid loading and instantiating Target multiple times.
* @returns {jQuery.Promise}
*/
function getTarget() {
showLoading();
if ( !targetPromise ) {
targetPromise = mw.loader.using( 'ext.visualEditor.viewPageTarget' )
.then( function () {
@ -46,6 +60,22 @@
return targetPromise;
}
/**
* Load the target and activate it.
*
* @returns {jQuery.Promise}
*/
function activateTarget( targetPromise ) {
return targetPromise
.then( function ( target ) {
return target.activate();
} )
.then( function () {
ve.track( 'mwedit.ready' );
} )
.always( hideLoading );
}
conf = mw.config.get( 'wgVisualEditorConfig' );
tabMessages = conf.tabMessages;
uri = new mw.Uri();
@ -333,7 +363,6 @@
return;
}
init.showLoading();
ve.track( 'mwedit.init', { type: 'page', mechanism: 'click' } );
if ( history.pushState && uri.query.veaction !== 'edit' ) {
@ -349,21 +378,15 @@
e.preventDefault();
getTarget().done( function ( target ) {
target.activate()
.done( function () {
ve.track( 'mwedit.ready' );
} )
.always( init.hideLoading );
} );
activateTarget( getTarget() );
},
onEditSectionLinkClick: function ( e ) {
var targetPromise;
if ( ( e.which && e.which !== 1 ) || e.shiftKey || e.altKey || e.ctrlKey || e.metaKey ) {
return;
}
init.showLoading();
ve.track( 'mwedit.init', { type: 'section', mechanism: 'click' } );
if ( history.pushState && uri.query.veaction !== 'edit' ) {
@ -378,27 +401,10 @@
e.preventDefault();
getTarget().done( function ( target ) {
targetPromise = getTarget().then( function ( target ) {
target.saveEditSection( $( e.target ).closest( 'h1, h2, h3, h4, h5, h6' ).get( 0 ) );
target.activate()
.done( function () {
ve.track( 'mwedit.ready' );
} )
.always( init.hideLoading );
} );
},
showLoading: function () {
if ( !init.$loading ) {
init.$loading = $( '<div class="mw-viewPageTarget-loading"></div>' );
}
$( '#firstHeading' ).prepend( init.$loading );
},
hideLoading: function () {
if ( init.$loading ) {
init.$loading.detach();
}
activateTarget( targetPromise );
}
};
@ -480,16 +486,9 @@
if ( init.isAvailable ) {
if ( isViewPage && uri.query.veaction === 'edit' ) {
isSection = uri.query.vesection !== undefined;
init.showLoading();
ve.track( 'mwedit.init', { type: isSection ? 'section' : 'page', mechanism: 'url' } );
getTarget().done( function ( target ) {
target.activate()
.done( function () {
ve.track( 'mwedit.ready' );
} )
.always( init.hideLoading );
} );
activateTarget( getTarget() );
}
}