Fix electron webview by updating src/utils/getEnvironment.js

master
Jerome Wu 4 years ago
parent 3f98fdeb0f
commit 820c91fa52
  1. 8
      src/utils/getEnvironment.js
  2. 1
      src/worker-script/browser/index.js
  3. 2
      src/worker-script/index.js

@ -3,12 +3,12 @@ const isElectron = require('is-electron');
module.exports = (key) => {
const env = {};
if (isElectron()) {
env.type = 'electron';
if (typeof WorkerGlobalScope !== 'undefined') {
env.type = 'webworker';
} else if (typeof window === 'object') {
env.type = 'browser';
} else if (typeof importScripts === 'function') {
env.type = 'webworker';
} else if (isElectron()) {
env.type = 'electron';
} else if (typeof process === 'object' && typeof require === 'function') {
env.type = 'node';
}

@ -29,5 +29,4 @@ worker.setAdapter({
gunzip,
fetch: () => {},
...cache,
isWebWorker: typeof window === 'undefined' && typeof importScripts === 'function',
});

@ -99,7 +99,7 @@ const loadLanguage = async ({
}
if (path !== null) {
const resp = await (isWebWorker || adapter.isWebWorker ? fetch : adapter.fetch)(`${path}/${lang}.traineddata${gzip ? '.gz' : ''}`);
const resp = await (isWebWorker ? fetch : adapter.fetch)(`${path}/${lang}.traineddata${gzip ? '.gz' : ''}`);
data = await resp.arrayBuffer();
} else {
data = await adapter.readCache(`${langPath}/${lang}.traineddata${gzip ? '.gz' : ''}`);

Loading…
Cancel
Save