From b20622b2c84ce3ca1781c7bf8e10fed0af1e5001 Mon Sep 17 00:00:00 2001 From: toasted-nutbread Date: Thu, 7 Jan 2021 21:36:20 -0500 Subject: Core refactor (#1207) * Copy set intersection functions * Remove unused functions * Simplify url check * Remove parseUrl * Simplify stringReverse * Remove hasOwn due to infrequent use * Rename errorToJson/jsonToError to de/serializeError For clarity on intended use. * Fix time argument on timeout * Add missing return value * Throw an error for unexpected argument values * Add documentation comments --- ext/bg/js/settings/dictionary-import-controller.js | 2 +- ext/bg/js/settings/generic-setting-controller.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'ext/bg/js/settings') diff --git a/ext/bg/js/settings/dictionary-import-controller.js b/ext/bg/js/settings/dictionary-import-controller.js index f392e5a9..436a056c 100644 --- a/ext/bg/js/settings/dictionary-import-controller.js +++ b/ext/bg/js/settings/dictionary-import-controller.js @@ -338,7 +338,7 @@ class DictionaryImportController { const errors = []; for (const {error} of results) { if (typeof error !== 'undefined') { - errors.push(jsonToError(error)); + errors.push(deserializeError(error)); } } return errors; diff --git a/ext/bg/js/settings/generic-setting-controller.js b/ext/bg/js/settings/generic-setting-controller.js index 95be975e..0d24c429 100644 --- a/ext/bg/js/settings/generic-setting-controller.js +++ b/ext/bg/js/settings/generic-setting-controller.js @@ -113,7 +113,7 @@ class GenericSettingController { _transformResults(values, targets) { return values.map((value, i) => { const error = value.error; - if (error) { return jsonToError(error); } + if (error) { return deserializeError(error); } const {metadata: {transforms}, element} = targets[i]; const result = this._applyTransforms(value.result, transforms, 'post', element); return {result}; -- cgit v1.2.3