wikimedia/mediawiki-extensions-VisualEditor
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/VisualEditor synced 2024-11-24 22:35:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update VE core submodule to master (9240a51)

Browse source 
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
This commit is contained in:
Trevor Parscal 2015-02-09 13:48:35 -08:00 committed by James D. Forrester
parent 0d3bd68431
commit a65148d69e
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ve

@ -1 +1 @@
Subproject commit c6dee65dffc7388b378ccadc5491a5739d33209c
Subproject commit 9240a513ccf5a2219e76abaa1f0570b9d19ddd7a

8
modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
View file

@ -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 } );