jenkins-bot has submitted this change and it was merged. Change subject: Papaparse update per https://github.com/edg2s/PapaParse/pull/2 ......................................................................
Papaparse update per https://github.com/edg2s/PapaParse/pull/2 Checks document.body exists before attaching event listener. Change-Id: I4adcddee85d425cf7e0bd63c316ca219634b2331 --- M lib/papaparse/papaparse.js 1 file changed, 11 insertions(+), 6 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/papaparse/papaparse.js b/lib/papaparse/papaparse.js index 6db12fc..26cf103 100644 --- a/lib/papaparse/papaparse.js +++ b/lib/papaparse/papaparse.js @@ -7,7 +7,7 @@ { "use strict"; - var IS_WORKER = !global.document, IS_SYNC = false, AUTO_SCRIPT_PATH; + var IS_WORKER = !global.document, LOADED_SYNC = false, AUTO_SCRIPT_PATH; var workers = {}, workerIdCounter = 0; // A configuration object from which to draw default settings @@ -156,9 +156,14 @@ { AUTO_SCRIPT_PATH = getScriptPath(); // Check if the script was loaded synchronously - document.body.addEventListener('load', function () { - IS_SYNC = true; - }, true); + if ( !document.body ) { + // Body doesn't exist yet, must be synchronous + LOADED_SYNC = true; + } else { + document.addEventListener('DOMContentLoaded', function () { + LOADED_SYNC = true; + }, true); + } } @@ -167,7 +172,7 @@ function CsvToJson(_input, _config) { var config = IS_WORKER ? _config : copyAndValidateConfig(_config); - var useWorker = config.worker && Papa.WORKERS_SUPPORTED && (Papa.SCRIPT_PATH || AUTO_SCRIPT_PATH); + var useWorker = config.worker && Papa.WORKERS_SUPPORTED; if (useWorker) { @@ -1367,7 +1372,7 @@ { if (!Papa.WORKERS_SUPPORTED) return false; - if (!IS_SYNC && Papa.SCRIPT_PATH === null) + if (!LOADED_SYNC && Papa.SCRIPT_PATH === null) throw new Error( 'Script path cannot be determined automatically when Papa Parse is loaded asynchronously. ' + 'You need to set Papa.SCRIPT_PATH manually.' -- To view, visit https://gerrit.wikimedia.org/r/176748 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4adcddee85d425cf7e0bd63c316ca219634b2331 Gerrit-PatchSet: 3 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders <[email protected]> Gerrit-Reviewer: Catrope <[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
