jenkins-bot has submitted this change and it was merged.
Change subject: More setImmediate fixes that weren't committed in b66b782e
......................................................................
More setImmediate fixes that weren't committed in b66b782e
b66b782e630885f1c08ad314fd9df63252b31e5a
Change-Id: Ie5da4717ba85406d63c18df2c9e5b699a13a3b7b
---
M js/lib/ext.core.ParserFunctions.js
M js/lib/mediawiki.ApiRequest.js
M js/tests/parserTests.js
3 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/js/lib/ext.core.ParserFunctions.js
b/js/lib/ext.core.ParserFunctions.js
index 40097e4..16d583d 100644
--- a/js/lib/ext.core.ParserFunctions.js
+++ b/js/lib/ext.core.ParserFunctions.js
@@ -20,6 +20,8 @@
"use strict";
+require('./core-upgrade.js');
+
var async = require('async');
var Util = require('./mediawiki.Util.js').Util;
var defines = require('./mediawiki.parser.defines.js');
@@ -187,7 +189,7 @@
// and using it, but have to bind lots
of args -- lazy today.
/* jshint loopfunc: true */
cb: function( i, val ) {
- process.nextTick(
+ setImmediate(
self._switchLookupFallback.bind( self, frame,
kvs.slice(i+1),
key, dict, cb, val )
);
diff --git a/js/lib/mediawiki.ApiRequest.js b/js/lib/mediawiki.ApiRequest.js
index 0f8f37d..1ec3ae7 100644
--- a/js/lib/mediawiki.ApiRequest.js
+++ b/js/lib/mediawiki.ApiRequest.js
@@ -1,5 +1,7 @@
"use strict";
+require('./core-upgrade.js');
+
var request = require('request'),
$ = require( './fakejquery' ),
qs = require('querystring'),
@@ -108,12 +110,12 @@
nextListener.call( self, error || null, src,
'text/x-mediawiki' );
}
if ( listeners.length ) {
- process.nextTick( processSome );
+ setImmediate( processSome );
}
};
- process.nextTick( processSome );
+ setImmediate( processSome );
};
/**
diff --git a/js/tests/parserTests.js b/js/tests/parserTests.js
index 3e57972..052aadd 100755
--- a/js/tests/parserTests.js
+++ b/js/tests/parserTests.js
@@ -399,7 +399,7 @@
var norm = this.env.normalizeTitle(item.title);
//console.log( 'processArticle ' + norm );
this.articles[norm] = item.text;
- process.nextTick( cb );
+ setImmediate( cb );
};
/**
@@ -821,7 +821,7 @@
this.env.conf.wiki.removeExtensionTag( extensions[i] );
}
- process.nextTick( endCb );
+ setImmediate( endCb );
}.bind( this );
var testTasks = [];
@@ -930,7 +930,7 @@
this.checkHTML( item, DU.serializeChildren(doc), options, mode );
// Now schedule the next test, if any
- process.nextTick( cb );
+ setImmediate( cb );
};
/**
@@ -958,7 +958,7 @@
this.checkWikitext( item, wikitext, options, mode );
// Now schedule the next test, if any
- process.nextTick( cb );
+ setImmediate( cb );
};
/**
@@ -1551,7 +1551,7 @@
/* jshint loopfunc: true */
tasks.push( function ( modeIndex, changesIndex,
cb ) {
if (done) {
- process.nextTick( cb );
+ setImmediate( cb );
} else {
var newitem = Util.clone( item
);
newitem.seed = changesIndex +
'';
@@ -1569,7 +1569,7 @@
item.cachedNormalizedHTML = newitem.cachedNormalizedHTML;
item.cachedResultHTML =
newitem.cachedResultHTML;
- process.nextTick( cb );
+ setImmediate( cb );
}.bind( this ) );
}
}.bind( this, i, j ) );
--
To view, visit https://gerrit.wikimedia.org/r/89368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie5da4717ba85406d63c18df2c9e5b699a13a3b7b
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Parsoid
Gerrit-Branch: master
Gerrit-Owner: Arlolra <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Subramanya Sastry <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
