Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
20 changes: 16 additions & 4 deletions capi/bind_gen/src/wasm_bindgen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -338,22 +338,34 @@ fn write_fn<W: Write>(mut writer: W, function: &Function, type_script: bool) ->

pub fn write_preload<W: Write>(mut writer: W, type_script: bool) -> Result<()> {
let content = if type_script {
r#"import init, { InitOutput } from "./livesplit_core.js";
r#"import init, { type InitOutput } from "./livesplit_core.js";

let promise: Promise<InitOutput> | null = null;
export async function preloadWasm(): Promise<InitOutput> {
if (!promise) {
promise = init();
const precompiled = (globalThis as any).__lscPreload;
if (precompiled) {
delete (globalThis as any).__lscPreload;
promise = init({ module_or_path: precompiled });
} else {
promise = init();
}
}
return await promise;
}"#
} else {
r#"import init from "./livesplit_core.js
r#"import init from "./livesplit_core.js";

let promise = null;
export async function preloadWasm() {
if (!promise) {
promise = init();
const precompiled = (globalThis).__lscPreload;
if (precompiled) {
delete (globalThis).__lscPreload;
promise = init({ module_or_path: precompiled });
} else {
promise = init();
}
}
return await promise;
}"#
Expand Down
2 changes: 1 addition & 1 deletion crates/livesplit-hotkey/src/modifiers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ impl FromStr for Modifiers {
match modifier {
"Ctrl" => modifiers.insert(Modifiers::CONTROL),
"Alt" => modifiers.insert(Modifiers::ALT),
/// Option as alias for Alt used on MacOS
// Option as alias for Alt used on MacOS
"Option" => modifiers.insert(Modifiers::ALT),
"Meta" => modifiers.insert(Modifiers::META),
"Shift" => modifiers.insert(Modifiers::SHIFT),
Expand Down
Loading