jenkins-bot has submitted this change and it was merged.
Change subject: mw.ViewPageTarget.init: Reduce Deferred clutter in getTarget()
......................................................................
mw.ViewPageTarget.init: Reduce Deferred clutter in getTarget()
* mw.loader.using returns a promise already.
* Use .then() instead of manually forwarding failures.
* Cache .promise() result.
Change-Id: I3d0a90051c389c02dd5714020b2a1fb872790a18
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
1 file changed, 7 insertions(+), 12 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 76633f5..f5ac2e7 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -18,7 +18,7 @@
*/
( function () {
var conf, tabMessages, uri, pageExists, viewUri, veEditUri, isViewPage,
- init, support, getTargetDeferred, enable, userPrefEnabled,
+ init, support, targetPromise, enable, userPrefEnabled,
plugins = [];
/**
@@ -26,11 +26,9 @@
* @returns {jQuery.Promise}
*/
function getTarget() {
- var loadTargetDeferred;
- if ( !getTargetDeferred ) {
- getTargetDeferred = $.Deferred();
- loadTargetDeferred = $.Deferred()
- .done( function () {
+ if ( !targetPromise ) {
+ targetPromise = mw.loader.using(
'ext.visualEditor.viewPageTarget' )
+ .then( function () {
var target = new
ve.init.mw.ViewPageTarget();
// Tee tracked events to MediaWiki
firehose, if available (1.23+).
@@ -46,13 +44,10 @@
// Add plugins
target.addPlugins( plugins );
- getTargetDeferred.resolve( target );
- } )
- .fail( getTargetDeferred.reject );
-
- mw.loader.using( 'ext.visualEditor.viewPageTarget',
loadTargetDeferred.resolve, loadTargetDeferred.reject );
+ return target;
+ } );
}
- return getTargetDeferred.promise();
+ return targetPromise;
}
conf = mw.config.get( 'wgVisualEditorConfig' );
--
To view, visit https://gerrit.wikimedia.org/r/159002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d0a90051c389c02dd5714020b2a1fb872790a18
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: Catrope <roan.katt...@gmail.com>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: Krinkle <krinklem...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
