From 9cfd8279bc5e6e6f295ad781d94b2e9512f80f9d Mon Sep 17 00:00:00 2001 From: Chase Porter Date: Wed, 29 Sep 2021 14:44:14 -0700 Subject: [PATCH] REFACTOR imageLoadingWorker and threadManager for vars into lets --- fdds/imageLoadingWorker.js | 2 +- fdds/threadManager.js | 28 ++++++++++++++-------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/fdds/imageLoadingWorker.js b/fdds/imageLoadingWorker.js index 18a77aa..4d8ede7 100644 --- a/fdds/imageLoadingWorker.js +++ b/fdds/imageLoadingWorker.js @@ -3,7 +3,7 @@ self.addEventListener('message', async event => { const imageInfo = event.data; - var imageURL = imageInfo.imageURL; + let imageURL = imageInfo.imageURL; const response = await fetch(imageURL); const blob = await response.blob(); imageInfo.blob = blob; diff --git a/fdds/threadManager.js b/fdds/threadManager.js index 3ed4a39..60a9192 100644 --- a/fdds/threadManager.js +++ b/fdds/threadManager.js @@ -6,7 +6,7 @@ const TIMEOUT_MS = 80; async function loadImagesInBatches(imageIndex=0, batchSize, imageInfos, worker) { let batchLimit = Math.min(imageIndex + batchSize, imageInfos.length - 1); for (imageIndex; imageIndex <= batchLimit; imageIndex++) { - var imageInfo = imageInfos[imageIndex]; + let imageInfo = imageInfos[imageIndex]; worker.postMessage(imageInfo); } if (imageIndex < imageInfos.length) { @@ -25,31 +25,31 @@ export class ThreadManager { } loadImages(loadFirst, loadLater) { - var firstSize = Math.ceil(loadFirst.length / this.N_WORKERS); - var laterSize = Math.ceil(loadLater.length / this.N_WORKERS); + let firstSize = Math.ceil(loadFirst.length / this.N_WORKERS); + let laterSize = Math.ceil(loadLater.length / this.N_WORKERS); this.cancelCurrentLoad(); - for (var i = 0; i < this.N_WORKERS; i++) { - var iFirst = i * firstSize; - var jFirst = Math.min((i+1) * firstSize, loadFirst.length); - var firstBatch = loadFirst.slice(iFirst, jFirst); + for (let i = 0; i < this.N_WORKERS; i++) { + let iFirst = i * firstSize; + let jFirst = Math.min((i+1) * firstSize, loadFirst.length); + let firstBatch = loadFirst.slice(iFirst, jFirst); - var iLater = i * laterSize; - var jLater = Math.min((i+1) * laterSize, loadLater.length); - var laterBatch = loadLater.slice(iLater, jLater); + let iLater = i * laterSize; + let jLater = Math.min((i+1) * laterSize, loadLater.length); + let laterBatch = loadLater.slice(iLater, jLater); - var worker = this.startThread(firstBatch, laterBatch); + let worker = this.startThread(firstBatch, laterBatch); this.workers.push(worker); } } startThread(loadFirst, loadLater) { - var worker = new Worker('imageLoadingWorker.js'); + let worker = new Worker('imageLoadingWorker.js'); worker.addEventListener('message', async event => { const imageData = event.data; this.updateCallback(imageData); }); - var batchSize = Math.min(Math.ceil(loadFirst.length / 20), MAX_BATCH_SIZE); + let batchSize = Math.min(Math.ceil(loadFirst.length / 20), MAX_BATCH_SIZE); loadImagesInBatches(0, batchSize, loadFirst, worker); loadImagesInBatches(0, batchSize, loadLater, worker); @@ -57,7 +57,7 @@ export class ThreadManager { } cancelCurrentLoad() { - for (var worker of this.workers) { + for (let worker of this.workers) { worker.terminate(); } this.workers = []; -- 2.11.4.GIT