Skip to content

Commit f5f8628

Browse files
authored
refactor: remove vanilla templates assignment to window object (#212)
* refactor: remove vanilla templates assignment to window object * change file
1 parent d4b9134 commit f5f8628

6 files changed

Lines changed: 22 additions & 17 deletions

File tree

.changes/vanilla-global.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
"create-tauri-app": patch
3+
"create-tauri-app-js": patch
4+
---
5+
6+
Change `vanilla` and `vanilla-ts` templates to attach the click handler through Javascript, instead of assigining to the `window` object.

packages/cli/fragments/fragment-vanilla-ts/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ <h1>Welcome to Tauri!</h1>
4646
<div class="row">
4747
<div>
4848
<input id="greet-input" placeholder="Enter a name..." />
49-
<button type="button" onclick="greet()">Greet</button>
49+
<button id="greet-button" type="button">Greet</button>
5050
</div>
5151
</div>
5252

packages/cli/fragments/fragment-vanilla-ts/src/main.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@ import { invoke } from "@tauri-apps/api/tauri";
33
let greetInputEl: HTMLInputElement | null;
44
let greetMsgEl: HTMLElement | null;
55

6-
window.addEventListener("DOMContentLoaded", () => {
7-
greetInputEl = document.querySelector("#greet-input");
8-
greetMsgEl = document.querySelector("#greet-msg");
9-
});
10-
116
async function greet() {
127
if (greetMsgEl && greetInputEl) {
138
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
@@ -17,4 +12,10 @@ async function greet() {
1712
}
1813
}
1914

20-
window.greet = greet;
15+
window.addEventListener("DOMContentLoaded", () => {
16+
greetInputEl = document.querySelector("#greet-input");
17+
greetMsgEl = document.querySelector("#greet-msg");
18+
document
19+
.querySelector("#greet-button")
20+
?.addEventListener("click", () => greet());
21+
});

packages/cli/fragments/fragment-vanilla-ts/src/vite-env.d.ts

Lines changed: 0 additions & 3 deletions
This file was deleted.

packages/cli/fragments/fragment-vanilla/src/index.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ <h1>Welcome to Tauri!</h1>
3838
<div class="row">
3939
<div>
4040
<input id="greet-input" placeholder="Enter a name..." />
41-
<button type="button" onclick="greet()">Greet</button>
41+
<button id="greet-button" type="button">Greet</button>
4242
</div>
4343
</div>
4444

packages/cli/fragments/fragment-vanilla/src/main.js

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,15 @@ const { invoke } = window.__TAURI__.tauri;
33
let greetInputEl;
44
let greetMsgEl;
55

6-
window.addEventListener("DOMContentLoaded", () => {
7-
greetInputEl = document.querySelector("#greet-input");
8-
greetMsgEl = document.querySelector("#greet-msg");
9-
});
10-
116
async function greet() {
127
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
138
greetMsgEl.textContent = await invoke("greet", { name: greetInputEl.value });
149
}
1510

16-
window.greet = greet;
11+
window.addEventListener("DOMContentLoaded", () => {
12+
greetInputEl = document.querySelector("#greet-input");
13+
greetMsgEl = document.querySelector("#greet-msg");
14+
document
15+
.querySelector("#greet-button")
16+
.addEventListener("click", () => greet());
17+
});

0 commit comments

Comments
 (0)