From a65148d69eaf2d7defd73effaa15db105f8f7b49 Mon Sep 17 00:00:00 2001 From: Trevor Parscal Date: Mon, 9 Feb 2015 13:48:35 -0800 Subject: [PATCH] Update VE core submodule to master (9240a51) New changes: 50ccb23 Localisation updates from https://translatewiki.net. 9240a51 Update OOjs UI to v0.7.0 Local changes: * MWTemplateDialog: Stop waiting for removed loading promise to finish, as in OOjs UI I2bfa013 the loading promise is removed since iframes were the only reason we needed it. Change-Id: I1500f480d40d06e417366014b9c2a76f7ce9c29b --- lib/ve | 2 +- modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/lib/ve b/lib/ve index c6dee65dff..9240a513cc 160000 --- a/lib/ve +++ b/lib/ve @@ -1 +1 @@ -Subproject commit c6dee65dffc7388b378ccadc5491a5739d33209c +Subproject commit 9240a513ccf5a2219e76abaa1f0570b9d19ddd7a diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js index fdaafff3b5..66eda5db91 100644 --- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js +++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js @@ -253,12 +253,8 @@ ve.ui.MWTemplateDialog.prototype.onRemoveParameter = function ( param ) { ve.ui.MWTemplateDialog.prototype.setApplicableStatus = function () { var parts = this.transclusionModel && this.transclusionModel.getParts(); - if ( this.loading.state() !== 'resolved' ) { - // Loading is not resolved - this.actions.setAbilities( { apply: false, insert: false } ); - } else if ( parts.length && !( parts[0] instanceof ve.dm.MWTemplatePlaceholderModel ) ) { - // Loading is resolved, and we have parts, and first one is not placeholder - this.actions.setAbilities( { apply: this.altered, insert: true } ); + if ( parts.length && !( parts[0] instanceof ve.dm.MWTemplatePlaceholderModel ) ) { + this.actions.setAbilities( { apply: true, insert: true } ); } else { // Loading is resolved. We have either: 1) no parts, or 2) the a placeholder as the first part this.actions.setAbilities( { apply: parts.length === 0 && this.altered, insert: false } );