Skip to content

Fix global is not defined #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f-fl0 merged 7 commits into from
Oct 5, 2022
Merged

Fix global is not defined #174

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e5ab59c
Rename global to globalThis
f-fl0 Oct 4, 2022
746d7a4
Fallback to global if available and globalThis is not defined
f-fl0 Oct 5, 2022
e4e2211
Update pcdeditor.js
f-fl0 Oct 5, 2022
24b8356
Add condition about global.Go
f-fl0 Oct 5, 2022
e07cd9b
Update pcdeditor.js
f-fl0 Oct 5, 2022
a83e39d
Fix syntax
f-fl0 Oct 5, 2022
71e460b
Remove unnecessary usage of globalThis
f-fl0 Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions pcdeditor.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -344,14 +344,23 @@ class PCDEditor {
setupControls(this.pcdeditor)
resolve()
}
const go = new global.Go()
let go
if (typeof globalThis !== 'undefined' && typeof globalThis.Go !== 'undefined') {
go = new globalThis.Go()
} else if (typeof global !== 'undefined' && typeof global.Go !== 'undefined') {
go = new global.Go()
} else {
this.logger("'Go' could not be defined from neither globalThis nor global")
return
}
const { instance } = await WebAssembly.instantiateStreaming(
fetch(this.opts.wasmPath, { cache: 'no-cache' }),
go.importObject,
)
go.run(instance)
}
if (typeof global === 'undefined' || typeof global.Go === 'undefined') {
if ((typeof globalThis === 'undefined' || typeof globalThis.Go === 'undefined') &&
(typeof global === 'undefined' || typeof global.Go === 'undefined')) {
const script = document.createElement('script')
script.onload = loadWasm
script.src = this.opts.wasmExecPath
Expand Down Expand Up @@ -417,7 +426,7 @@ class PCDEditor {
return resp.blob()
})
.then((yamlBlob) => {
const img = new global.Image()
const img = new Image()
img.onload = async () => {
await this.pcdeditor.import2D(yamlBlob, img)
resolve()
Expand Down