jenkins-bot has submitted this change and it was merged.

Change subject: Check surface is visible before trying to render fragments
......................................................................


Check surface is visible before trying to render fragments

Bug: T110538
Change-Id: I292bff99cd9af20f8fae5078d7c6d576a14a9063
---
M src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
1 file changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Jforrester: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js 
b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
index 6705b0d..268c13f 100644
--- a/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
+++ b/src/ui/dialogs/ve.ui.FindAndReplaceDialog.js
@@ -56,7 +56,7 @@
        this.results = 0;
        // Range over the list of fragments indicating which ones where 
rendered,
        // e.g. [1,3] means fragments 1 & 2 were rendered
-       this.renderedFragments = null;
+       this.renderedFragments = new ve.Range();
        this.replacing = false;
        this.focusedIndex = 0;
        this.query = null;
@@ -321,7 +321,11 @@
 ve.ui.FindAndReplaceDialog.prototype.renderFragments = function () {
        var i, selection, viewportRange, start, end;
 
-       if ( this.replacing ) {
+       if (
+               this.replacing ||
+               // Check the surface isn't hidden, such as during deactivation
+               !this.surface.getView().$element.is( ':visible' )
+       ) {
                return;
        }
 

-- 
To view, visit https://gerrit.wikimedia.org/r/234511
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I292bff99cd9af20f8fae5078d7c6d576a14a9063
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to