jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (9240a51) ......................................................................
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 --- M lib/ve M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js 2 files changed, 2 insertions(+), 6 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index c6dee65..9240a51 160000 --- a/lib/ve +++ b/lib/ve -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 fdaafff..66eda5d 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.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 } ); -- To view, visit https://gerrit.wikimedia.org/r/189593 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1500f480d40d06e417366014b9c2a76f7ce9c29b Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Trevor Parscal <[email protected]> Gerrit-Reviewer: Alex Monk <[email protected]> Gerrit-Reviewer: Catrope <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
