From 1a054dbc9cab3877c3b1cb0a05784e0cccbbd161 Mon Sep 17 00:00:00 2001 From: Xuan Sang LE Date: Wed, 16 Aug 2017 00:57:11 +0200 Subject: [PATCH] fix exit --- src/core/BaseApplication.coffee | 6 +++--- src/packages/ActivityMonitor/main.coffee | 2 +- src/packages/wTerm/main.coffee | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/core/BaseApplication.coffee b/src/core/BaseApplication.coffee index b26131a..ea6b0a7 100644 --- a/src/core/BaseApplication.coffee +++ b/src/core/BaseApplication.coffee @@ -47,7 +47,7 @@ class BaseApplication extends this.OS.GUI.BaseModel ($ @scheme).remove() baseMenu: -> - menu = + mn = [{ text: _APP[@name].meta.name, child: [ @@ -55,8 +55,8 @@ class BaseApplication extends this.OS.GUI.BaseModel { text: "Exit", dataid: "#{@name}-exit" } ] }] - menu = menu.concat @menu() || [] - menu + mn = mn.concat @menu() || [] + mn main: -> #main program diff --git a/src/packages/ActivityMonitor/main.coffee b/src/packages/ActivityMonitor/main.coffee index e653462..c9766a9 100644 --- a/src/packages/ActivityMonitor/main.coffee +++ b/src/packages/ActivityMonitor/main.coffee @@ -52,7 +52,7 @@ class ActivityMonitor extends this.OS.GUI.BaseApplication else me.gdata.processes[i] = undefined @grid.set "rows",activeList - exit: (e) -> + cleanup: (e) -> clearTimeout @timer if @timer ActivityMonitor.singleton = true diff --git a/src/packages/wTerm/main.coffee b/src/packages/wTerm/main.coffee index 6ec56e8..bd37d83 100644 --- a/src/packages/wTerm/main.coffee +++ b/src/packages/wTerm/main.coffee @@ -66,6 +66,6 @@ class wTerm extends this.OS.GUI.BaseApplication me.socket = null console.log "socket closed" #el.style.display = "block" - exit: (e)-> + cleanup: (e)-> @socket.close() if @socket this.OS.register "wTerm",wTerm \ No newline at end of file