Skip to content
This repository was archived by the owner on Apr 28, 2020. It is now read-only.

Commit 008820d

Browse files
nhooyrnhooyr
committed
Move all javascript into function scope
1 parent 8aa7b57 commit 008820d

File tree

2 files changed

+69
-69
lines changed

2 files changed

+69
-69
lines changed

‎sail.js

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,80 @@
1-
function startReloadUI() {
2-
const div = document.createElement("div")
3-
div.className = "msgbox-overlay"
4-
div.style.opacity = 1
5-
div.style.textAlign = "center"
6-
div.innerHTML = `<div class="msgbox">
7-
<div class="msg">Reloading container</div>
8-
</div>`
9-
document.querySelector(".monaco-workbench").appendChild(div)
10-
}
11-
12-
function removeElementsByClass(className) {
13-
let elements = document.getElementsByClassName(className);
14-
for (let e of elements) {
15-
e.parentNode.removeChild(e)
1+
function() {
2+
function startReloadUI() {
3+
const div = document.createElement("div")
4+
div.className = "msgbox-overlay"
5+
div.style.opacity = 1
6+
div.style.textAlign = "center"
7+
div.innerHTML = `<div class="msgbox">
8+
<div class="msg">Reloading container</div>
9+
</div>`
10+
document.querySelector(".monaco-workbench").appendChild(div)
1611
}
17-
}
18-
19-
function stopReloadUI() {
20-
removeElementsByClass("msgbox-overlay")
21-
}
2212

23-
function rebuild() {
24-
const tsrv = window.ide.workbench.terminalService
13+
function removeElementsByClass(className) {
14+
let elements = document.getElementsByClassName(className);
15+
for (let e of elements) {
16+
e.parentNode.removeChild(e)
17+
}
18+
}
2519

26-
if (tty == null) {
27-
tty = tsrv.createTerminal({
28-
name: "sail",
29-
isRendererOnly: true,
30-
}, false)
31-
} else {
32-
tty.clear()
20+
function stopReloadUI() {
21+
removeElementsByClass("msgbox-overlay")
3322
}
34-
let oldTTY = tsrv.getActiveInstance()
35-
tsrv.setActiveInstance(tty)
36-
// Show the panel and focus it to prevent the user from editing the Dockerfile.
37-
tsrv.showPanel(true)
3823

39-
startReloadUI()
24+
let tty
25+
function rebuild() {
26+
const tsrv = window.ide.workbench.terminalService
4027

41-
const ws = new WebSocket("ws://" + location.host + "/sail/api/v1/reload")
42-
ws.onmessage = (ev) => {
43-
const msg = JSON.parse(ev.data)
44-
const out = atob(msg.v).replace(/\n/g, "\n\r")
45-
tty.write(out)
46-
}
47-
ws.onclose = (ev) => {
48-
if (ev.code === 1000) {
49-
tsrv.setActiveInstance(oldTTY)
28+
if (tty == null) {
29+
tty = tsrv.createTerminal({
30+
name: "sail",
31+
isRendererOnly: true,
32+
}, false)
5033
} else {
51-
alert("reload failed; please see logs in sail terminal")
34+
tty.clear()
5235
}
53-
stopReloadUI()
54-
}
55-
}
36+
let oldTTY = tsrv.getActiveInstance()
37+
tsrv.setActiveInstance(tty)
38+
// Show the panel and focus it to prevent the user from editing the Dockerfile.
39+
tsrv.showPanel(true)
5640

57-
let tty
58-
window.addEventListener("ide-ready", () => {
59-
const statusBarService = window.ide.workbench.statusbarService
60-
statusBarService.addEntry({
61-
text: "rebuild",
62-
tooltip: "press super+alt+r to rebuild",
63-
command: "rebuild-sail-container"
64-
// showBeak: true <- what does this do?
65-
}, 0)
41+
startReloadUI()
6642

67-
const commandRegistry = window.ide.workbench.commandRegistry
68-
commandRegistry.registerCommand({
69-
id: "rebuild-sail-container",
70-
handler: (accessor, args) => {
71-
rebuild()
72-
},
73-
description: {
74-
description: "Rebuild sail container",
75-
args: []
43+
const ws = new WebSocket("ws://" + location.host + "/sail/api/v1/reload")
44+
ws.onmessage = (ev) => {
45+
const msg = JSON.parse(ev.data)
46+
const out = atob(msg.v).replace(/\n/g, "\n\r")
47+
tty.write(out)
7648
}
77-
})
49+
ws.onclose = (ev) => {
50+
if (ev.code === 1000) {
51+
tsrv.setActiveInstance(oldTTY)
52+
} else {
53+
alert("reload failed; please see logs in sail terminal")
54+
}
55+
stopReloadUI()
56+
}
57+
}
7858

79-
const
80-
})
59+
window.addEventListener("ide-ready", () => {
60+
const statusBarService = window.ide.workbench.statusbarService
61+
statusBarService.addEntry({
62+
text: "rebuild",
63+
tooltip: "press super+alt+r to rebuild",
64+
command: "rebuild-sail-container"
65+
// showBeak: true <- what does this do?
66+
}, 0)
67+
68+
const commandRegistry = window.ide.workbench.commandRegistry
69+
commandRegistry.registerCommand({
70+
id: "rebuild-sail-container",
71+
handler: (accessor, args) => {
72+
rebuild()
73+
},
74+
description: {
75+
description: "Rebuild sail container",
76+
args: []
77+
}
78+
})
79+
})
80+
}

‎sail.js.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
package main
22

33
//go:generate go run sail.js_gen.go
4-
const sailJS = "function startReloadUI() {\n const div = document.createElement(\"div\")\n div.className = \"msgbox-overlay\"\n div.style.opacity = 1\n div.style.textAlign = \"center\"\n div.innerHTML = `<div class=\"msgbox\">\n<div class=\"msg\">Reloading container</div>\n</div>`\n document.querySelector(\".monaco-workbench\").appendChild(div)\n}\n\nfunction removeElementsByClass(className) {\n let elements = document.getElementsByClassName(className);\n for (let e of elements) {\n e.parentNode.removeChild(e)\n }\n}\n\nfunction stopReloadUI() {\n removeElementsByClass(\"msgbox-overlay\")\n}\n\nfunction rebuild() {\n const tsrv = window.ide.workbench.terminalService\n\n if (tty == null) {\n tty = tsrv.createTerminal({\n name: \"sail\",\n isRendererOnly: true,\n }, false)\n } else {\n tty.clear()\n }\n let oldTTY = tsrv.getActiveInstance()\n tsrv.setActiveInstance(tty)\n // Show the panel and focus it to prevent the user from editing the Dockerfile.\n tsrv.showPanel(true)\n\n startReloadUI()\n\n const ws = new WebSocket(\"ws://\" + location.host + \"/sail/api/v1/reload\")\n ws.onmessage = (ev) => {\n const msg = JSON.parse(ev.data)\n const out = atob(msg.v).replace(/\\n/g, \"\\n\\r\")\n tty.write(out)\n }\n ws.onclose = (ev) => {\n if (ev.code === 1000) {\n tsrv.setActiveInstance(oldTTY)\n } else {\n alert(\"reload failed; please see logs in sail terminal\")\n }\n stopReloadUI()\n }\n}\n\nlet tty\nwindow.addEventListener(\"ide-ready\", () => {\n const statusBarService = window.ide.workbench.statusbarService\n statusBarService.addEntry({\n text: \"rebuild\",\n tooltip: \"press super+alt+r to rebuild\",\n command: \"rebuild-sail-container\"\n // showBeak: true <- what does this do?\n }, 0)\n\n const commandRegistry = window.ide.workbench.commandRegistry\n commandRegistry.registerCommand({\n id: \"rebuild-sail-container\",\n handler: (accessor, args) => {\n rebuild()\n },\n description: {\n description: \"Rebuild sail container\",\n args: []\n }\n })\n})\n"
4+
const sailJS = "function() {\n function startReloadUI() {\n const div = document.createElement(\"div\")\n div.className = \"msgbox-overlay\"\n div.style.opacity = 1\n div.style.textAlign = \"center\"\n div.innerHTML = `<div class=\"msgbox\">\n <div class=\"msg\">Reloading container</div>\n </div>`\n document.querySelector(\".monaco-workbench\").appendChild(div)\n }\n\n function removeElementsByClass(className) {\n let elements = document.getElementsByClassName(className);\n for (let e of elements) {\n e.parentNode.removeChild(e)\n }\n }\n\n function stopReloadUI() {\n removeElementsByClass(\"msgbox-overlay\")\n }\n\n let tty\n function rebuild() {\n const tsrv = window.ide.workbench.terminalService\n\n if (tty == null) {\n tty = tsrv.createTerminal({\n name: \"sail\",\n isRendererOnly: true,\n }, false)\n } else {\n tty.clear()\n }\n let oldTTY = tsrv.getActiveInstance()\n tsrv.setActiveInstance(tty)\n // Show the panel and focus it to prevent the user from editing the Dockerfile.\n tsrv.showPanel(true)\n\n startReloadUI()\n\n const ws = new WebSocket(\"ws://\" + location.host + \"/sail/api/v1/reload\")\n ws.onmessage = (ev) => {\n const msg = JSON.parse(ev.data)\n const out = atob(msg.v).replace(/\\n/g, \"\\n\\r\")\n tty.write(out)\n }\n ws.onclose = (ev) => {\n if (ev.code === 1000) {\n tsrv.setActiveInstance(oldTTY)\n } else {\n alert(\"reload failed; please see logs in sail terminal\")\n }\n stopReloadUI()\n }\n }\n\n window.addEventListener(\"ide-ready\", () => {\n const statusBarService = window.ide.workbench.statusbarService\n statusBarService.addEntry({\n text: \"rebuild\",\n tooltip: \"press super+alt+r to rebuild\",\n command: \"rebuild-sail-container\"\n // showBeak: true <- what does this do?\n }, 0)\n\n const commandRegistry = window.ide.workbench.commandRegistry\n commandRegistry.registerCommand({\n id: \"rebuild-sail-container\",\n handler: (accessor, args) => {\n rebuild()\n },\n description: {\n description: \"Rebuild sail container\",\n args: []\n }\n })\n })\n}"

0 commit comments

Comments
 (0)