ric/uptime-kuma
1
0
Fork 0
mirror of https://github.com/louislam/uptime-kuma.git synced 2024-11-23 14:54:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'louislam:master' into feature/time-format

Browse source
This commit is contained in:
Mohammad Jibin 2023-10-08 13:36:16 +05:30 committed by GitHub
commit 556d98754d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/components/MonitorList.vue
View file

@ -346,7 +346,7 @@ export default {
pauseSelected() { pauseSelected() {
Object.keys(this.selectedMonitors) Object.keys(this.selectedMonitors)
.filter(id => this.$root.monitorList[id].active) .filter(id => this.$root.monitorList[id].active)
.forEach(id => this.$root.getSocket().emit("pauseMonitor", id)); .forEach(id => this.$root.getSocket().emit("pauseMonitor", id, () => {}));
this.cancelSelectMode(); this.cancelSelectMode();
}, },
@ -357,7 +357,7 @@ export default {
resumeSelected() { resumeSelected() {
Object.keys(this.selectedMonitors) Object.keys(this.selectedMonitors)
.filter(id => !this.$root.monitorList[id].active) .filter(id => !this.$root.monitorList[id].active)
.forEach(id => this.$root.getSocket().emit("resumeMonitor", id)); .forEach(id => this.$root.getSocket().emit("resumeMonitor", id, () => {}));
this.cancelSelectMode(); this.cancelSelectMode();
}, },

2
src/util.js
View file

@ -2,7 +2,7 @@
// Common Util for frontend and backend // Common Util for frontend and backend
// //
// DOT NOT MODIFY util.js! // DOT NOT MODIFY util.js!
// Need to run "tsc" to compile if there are any changes. // Need to run "npm run tsc" to compile if there are any changes.
// //
// Backend uses the compiled file util.js // Backend uses the compiled file util.js
// Frontend uses util.ts // Frontend uses util.ts

2
src/util.ts
View file

@ -1,7 +1,7 @@
// Common Util for frontend and backend // Common Util for frontend and backend
// //
// DOT NOT MODIFY util.js! // DOT NOT MODIFY util.js!
// Need to run "tsc" to compile if there are any changes. // Need to run "npm run tsc" to compile if there are any changes.
// //
// Backend uses the compiled file util.js // Backend uses the compiled file util.js
// Frontend uses util.ts // Frontend uses util.ts