Divec has uploaded a new change for review.
https://gerrit.wikimedia.org/r/303335
Change subject: Always call back if SurfaceObserver sees a branch node change
......................................................................
Always call back if SurfaceObserver sees a branch node change
Bug: T122291
Change-Id: I1e1094b1d94a21ed742ef52d612bef52997f2ba4
---
M src/ce/ve.ce.SurfaceObserver.js
1 file changed, 12 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/35/303335/1
diff --git a/src/ce/ve.ce.SurfaceObserver.js b/src/ce/ve.ce.SurfaceObserver.js
index 4c9d9f1..1f601b6 100644
--- a/src/ce/ve.ce.SurfaceObserver.js
+++ b/src/ce/ve.ce.SurfaceObserver.js
@@ -123,6 +123,9 @@
/**
* Poll to update SurfaceObserver, but don't signal any changes back to the
Surface
+ * (except branch node changes)
+ *
+ * TODO: The method name is misleading because branch node changes are
signalled
*
* @method
*/
@@ -146,7 +149,8 @@
*
* @method
* @private
- * @param {boolean} signalChanges If there changes are observed, call
Surface#handleObservedChange
+ * @param {boolean} signalChanges Call Surface#handleObservedChange if
content/selection changes
+ * are observed (branch node changes are always signalled).
* @param {boolean} selectionOnly Check for selection changes only
*/
ve.ce.SurfaceObserver.prototype.pollOnceInternal = function ( signalChanges,
selectionOnly ) {
@@ -164,13 +168,14 @@
);
this.rangeState = newState;
- if ( signalChanges && (
- newState.contentChanged ||
- // TODO: The prior code signalled branchNode changes even if
!signalChanges .
- // Was this needed?
+ if (
+ // Signal branch node changes even if !signalChanges: see
T122291.
newState.branchNodeChanged ||
- newState.selectionChanged
- ) ) {
+ (
+ signalChanges &&
+ ( newState.contentChanged || newState.selectionChanged )
+ )
+ ) {
this.surface.handleObservedChanges( oldState, newState );
}
};
--
To view, visit https://gerrit.wikimedia.org/r/303335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e1094b1d94a21ed742ef52d612bef52997f2ba4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Divec <da...@troi.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
