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

Change subject: Fix for IE bug where clearTimeout doesn't clear the timeout
......................................................................


Fix for IE bug where clearTimeout doesn't clear the timeout

Apparently in IE even after you call clearTimeout, the function passed
to setTimeout might still get invoked (not 100% of the time).

It depends on the time difference between calling clearTimeout and
when that function was supposed to be called.

Change-Id: I050c1ecc51c1d891a028fb777243573487357171
---
M modules/ve/ce/ve.ce.SurfaceObserver.js
1 file changed, 4 insertions(+), 0 deletions(-)

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



diff --git a/modules/ve/ce/ve.ce.SurfaceObserver.js 
b/modules/ve/ce/ve.ce.SurfaceObserver.js
index 069e95f..833215d 100644
--- a/modules/ve/ce/ve.ce.SurfaceObserver.js
+++ b/modules/ve/ce/ve.ce.SurfaceObserver.js
@@ -95,6 +95,10 @@
 ve.ce.SurfaceObserver.prototype.poll = function ( async ) {
        var delayPoll, $branch, node, text, hash, range, rangyRange;
 
+       if ( this.polling === false ) {
+               return;
+       }
+
        if ( this.timeoutId !== null ) {
                clearTimeout( this.timeoutId );
                this.timeoutId = null;

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I050c1ecc51c1d891a028fb777243573487357171
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Inez <i...@wikia-inc.com>
Gerrit-Reviewer: Christian <christ...@wikia-inc.com>
Gerrit-Reviewer: Krinkle <ttij...@wikimedia.org>
Gerrit-Reviewer: Trevor Parscal <tpars...@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