jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (61dea59)
......................................................................
Update VE core submodule to master (61dea59)
New changes:
76bbf3b [BREAKING CHANGE] Fix camel-casing of countNonInternalElements
Local changes:
Use renamed countNonInternalElements function
Change-Id: Ib5f86ea5cfeb5e577f61349ed4bbb231ea155638
---
M lib/ve
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
3 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 0709218..61dea59 160000
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 07092183c1d39ed15839a0355aefd64fc8041d51
+Subproject commit 61dea59eedc4efc6057841dc0ca137303a032c51
diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index 0c0eb88..4187c35 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -300,7 +300,7 @@
fragment.insertContent( contentToInsert );
// Check if there is caption document and insert it
captionDoc = this.getCaptionDocument();
- if ( captionDoc.data.getLength() > 4 ) {
+ if ( captionDoc.data.countNonInternalElements() > 2 ) {
// Add contents of new caption
surfaceModel.change(
ve.dm.Transaction.newFromDocumentInsertion(
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 70e24ba..696d486 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -178,7 +178,7 @@
ve.ui.MWReferenceDialog.prototype.onDocumentTransact = function () {
var data = this.referenceModel.getDocument().data,
// TODO: Check for other types of empty, e.g. only whitespace?
- hasContent = data.countNoninternalElements() > 2;
+ hasContent = data.countNonInternalElements() > 2;
this.actions.setAbilities( {
'apply': hasContent,
--
To view, visit https://gerrit.wikimedia.org/r/148659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib5f86ea5cfeb5e577f61349ed4bbb231ea155638
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[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
