jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/342875 )
Change subject: ve.ce.Surface: Check delayed sequences when deactivating surface
......................................................................
ve.ce.Surface: Check delayed sequences when deactivating surface
This allows complete delayed sequences to be executed also when the user
opens a dialog. Follow-up to 32759ae861bb92783315ff89a41d9cdfe4ce4f34.
Bug: T117165
Change-Id: I2af0a738afa43295bf6d7d612cac4349bc6cd20d
---
M src/ce/ve.ce.Surface.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index d17aa32..e3fabf0 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -591,6 +591,7 @@
// until the surface is activated
this.surfaceObserver.disable();
this.deactivated = true;
+ this.checkDelayedSequences();
// Remove ranges so the user can't accidentally type into the
document
this.nativeSelection.removeAllRanges();
this.updateDeactivatedSelection();
@@ -2956,7 +2957,7 @@
model = this.getModel(),
selection = this.getSelection();
- if ( !selection.isNativeCursor() ) {
+ if ( this.deactivated || !selection.isNativeCursor() ) {
matchingSequences = [];
} else {
matchingSequences =
this.getSurface().sequenceRegistry.findMatching( model.getDocument().data,
selection.getModel().getCoveringRange().end );
--
To view, visit https://gerrit.wikimedia.org/r/342875
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2af0a738afa43295bf6d7d612cac4349bc6cd20d
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
Gerrit-Reviewer: Esanders <[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
