jenkins-bot has submitted this change and it was merged.
Change subject: Allow DM-identical range changes to cause a rerender
......................................................................
Allow DM-identical range changes to cause a rerender
Bug: T101523
Change-Id: Iae9866f03e6bd086048f413ff813cf0dd17f889b
---
M src/ce/ve.ce.Surface.js
M src/ce/ve.ce.SurfaceObserver.js
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Esanders: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 4377f75..b4ece3e 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -2532,7 +2532,7 @@
* @param {ve.Range|null} newRange
*/
ve.ce.Surface.prototype.onSurfaceObserverRangeChange = function ( oldRange,
newRange ) {
- if ( oldRange && oldRange.equalsSelection( newRange ) ) {
+ if ( !newRange.isCollapsed() && oldRange && oldRange.equalsSelection(
newRange ) ) {
// Ignore when the newRange is just a flipped oldRange
return;
}
diff --git a/src/ce/ve.ce.SurfaceObserver.js b/src/ce/ve.ce.SurfaceObserver.js
index 222e192..ab151f7 100644
--- a/src/ce/ve.ce.SurfaceObserver.js
+++ b/src/ce/ve.ce.SurfaceObserver.js
@@ -230,6 +230,9 @@
}
if ( newState.selectionChanged && emitChanges ) {
+ // Caution: selectionChanged is true if the CE selection is
different, which can
+ // be the case even if the DM selection is unchanged. So the
following line can
+ // emit a rangeChange event with identical oldState and
newState.
this.emit(
'rangeChange',
( oldState ? oldState.veRange : null ),
--
To view, visit https://gerrit.wikimedia.org/r/217221
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae9866f03e6bd086048f413ff813cf0dd17f889b
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@sheetmusic.org.uk>
Gerrit-Reviewer: Divec <da...@sheetmusic.org.uk>
Gerrit-Reviewer: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
