mirror of
https://github.com/louislam/uptime-kuma.git
synced 2024-11-23 23:04:04 +00:00
Merge branch 'louislam:master' into feature/time-format
This commit is contained in:
commit
556d98754d
3 changed files with 4 additions and 4 deletions
|
@ -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,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
|
||||||
|
|
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue