jenkins-bot has submitted this change and it was merged.
Change subject: Use new hasContent method on linear data
......................................................................
Use new hasContent method on linear data
Change-Id: I430e628a9db30970ecdf6996bc51e7440a474077
---
M modules/ve-mw/dm/models/ve.dm.MWImageModel.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
index 45a2061..fc577d9 100644
--- a/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
+++ b/modules/ve-mw/dm/models/ve.dm.MWImageModel.js
@@ -484,7 +484,7 @@
fragment.insertContent( contentToInsert );
// Check if there is caption document and insert it
captionDoc = this.getCaptionDocument();
- if ( captionDoc.data.countNonInternalElements() > 2 ) {
+ if ( captionDoc.data.hasContent() ) {
// 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 343945b..2929bf2 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -137,7 +137,7 @@
*/
ve.ui.MWReferenceDialog.prototype.documentHasContent = function () {
// TODO: Check for other types of empty, e.g. only whitespace?
- return
this.referenceModel.getDocument().data.countNonInternalElements() > 2;
+ return this.referenceModel.getDocument().data.hasContent();
};
/*
--
To view, visit https://gerrit.wikimedia.org/r/221842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I430e628a9db30970ecdf6996bc51e7440a474077
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <[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
