From 321811cb5d510f8e7ca25b9db9a950f9cd51f279 Mon Sep 17 00:00:00 2001 From: eight Date: Sun, 2 Sep 2018 12:23:52 +0800 Subject: [PATCH] Fix: requestId -> id --- edit/editor-worker-body.js | 4 ++-- edit/editor-worker.js | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/edit/editor-worker-body.js b/edit/editor-worker-body.js index 677808ef..a4458dd6 100644 --- a/edit/editor-worker-body.js +++ b/edit/editor-worker-body.js @@ -93,12 +93,12 @@ function createAPI(methods) { Promise.resolve() .then(() => methods[message.action](...message.args)) .then(result => ({ - requestId: message.requestId, + id: message.id, error: false, data: result })) .catch(err => ({ - requestId: message.requestId, + id: message.id, error: true, data: cloneError(err) })) diff --git a/edit/editor-worker.js b/edit/editor-worker.js index d3641656..57d5b410 100644 --- a/edit/editor-worker.js +++ b/edit/editor-worker.js @@ -14,29 +14,29 @@ var editorWorker = (() => { }); function createWorker() { - let requestId = 0; + let id = 0; const pending = new Map(); const worker = new Worker('/edit/editor-worker-body.js'); worker.onmessage = e => { const message = e.data; if (message.error) { - pending.get(message.requestId).reject(message.data); + pending.get(message.id).reject(message.data); } else { - pending.get(message.requestId).resolve(message.data); + pending.get(message.id).resolve(message.data); } - pending.delete(message.requestId); + pending.delete(message.id); }; return {invoke}; function invoke(action, args) { return new Promise((resolve, reject) => { - pending.set(requestId, {resolve, reject}); + pending.set(id, {resolve, reject}); worker.postMessage({ - requestId, + id, action, args }); - requestId++; + id++; }); } }