jenkins-bot has submitted this change and it was merged.
Change subject: Followup b8d8a5b: pass selections, not ranges, to
SurfaceFragment#clone
......................................................................
Followup b8d8a5b: pass selections, not ranges, to SurfaceFragment#clone
Bug: 71825
Change-Id: I095d20840a1844f557a023f933aa1e6104138002
---
M modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
index 29ce62a..98cdb66 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWCitationDialog.js
@@ -192,7 +192,9 @@
// initialized the
internal node with a paragraph - getting the range of the
// item covers the
entire paragraph so we have to get the range of it's
// first (and empty)
child
-
this.getFragment().clone( item.getChildren()[0].getRange() )
+
this.getFragment().clone(
+ new
ve.dm.LinearSelection( doc, item.getChildren()[0].getRange() )
+ )
);
}
}
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 9027633..bb6dee0 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -972,7 +972,7 @@
if ( this.selectedNode ) {
// Remove the old image
this.fragment =
this.getFragment().clone(
-
this.selectedNode.getOuterRange()
+ new
ve.dm.LinearSelection( this.fragment.getDocument(),
this.selectedNode.getOuterRange() )
);
this.fragment.removeContent();
}
--
To view, visit https://gerrit.wikimedia.org/r/165592
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I095d20840a1844f557a023f933aa1e6104138002
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
