From 9de4e5ff5fe00eaf8b6caf0b53f7ec9d6a594ada Mon Sep 17 00:00:00 2001
From: Xuan Sang LE <xsang.le@gmail.com>
Date: Wed, 28 Feb 2018 17:18:00 +0100
Subject: [PATCH] fix startup

---
 src/antos.coffee     |  1 -
 src/core/core.coffee |  2 ++
 src/core/gui.coffee  | 44 +++++++++++++++++++++-----------------------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/src/antos.coffee b/src/antos.coffee
index c996067..ae5ff72 100644
--- a/src/antos.coffee
+++ b/src/antos.coffee
@@ -4,5 +4,4 @@ _PM  = self.OS.PM
 _OS = self.OS
 _courrier = self.OS.courrier
 this.onload = () ->
-    console.log "Booting the os"
     self.OS.boot()
\ No newline at end of file
diff --git a/src/core/core.coffee b/src/core/core.coffee
index 24dd472..ca409f0 100644
--- a/src/core/core.coffee
+++ b/src/core/core.coffee
@@ -91,6 +91,7 @@ self.OS or=
             a.quit() for a in tmp
 
     cleanup: ->
+        console.log "Clean up system"
         ($ "#wrapper").empty()
         _GUI.clearTheme()
         _courrier.observable = riot.observable()
@@ -108,6 +109,7 @@ self.OS or=
         
     boot: ->
         #first login
+        console.log "Booting sytem"
         _API.handler.auth (d) ->
             # in case someone call it more than once :)
             if d.error
diff --git a/src/core/gui.coffee b/src/core/gui.coffee
index 96425d3..6567a73 100644
--- a/src/core/gui.coffee
+++ b/src/core/gui.coffee
@@ -188,6 +188,26 @@ self.OS.GUI =
             scheme =  $.parseHTML x
             ($ "#wrapper").append scheme
             
+            _courrier.observable.one "sysdockloaded", () ->
+                ($ window).bind 'keydown', (event) ->
+                    dock = ($ "#sysdock")[0]
+                    return unless dock
+                    app = dock.get "selectedApp"
+                    return true unless app
+                    c = String.fromCharCode(event.which).toUpperCase()
+                    fnk = undefined
+                    if event.ctrlKey
+                        fnk = "CTRL"
+                    else if event.metaKey
+                        fnk = "META"
+                    else if event.shiftKey
+                        fnk = "SHIFT"
+                    else if event.altKey
+                        fnk = "ALT"
+                    
+                    return unless fnk
+                    r = app.shortcut fnk, c
+                    event.preventDefault() if not r
             # system menu and dock
             riot.mount ($ "#syspanel", $ "#wrapper")
             riot.mount ($ "#sysdock", $ "#wrapper"), { items: [] }
@@ -196,23 +216,6 @@ self.OS.GUI =
             riot.mount ($ "#contextmenu")
             ($ "#workspace").contextmenu (e) -> _GUI.bindContextMenu e
             
-            ($ window).bind 'keydown', (event) ->
-                app = ($ "#sysdock")[0].get "selectedApp"
-                return true unless app
-                c = String.fromCharCode(event.which).toUpperCase()
-                fnk = undefined
-                if event.ctrlKey
-                    fnk = "CTRL"
-                else if event.metaKey
-                    fnk = "META"
-                else if event.shiftKey
-                    fnk = "SHIFT"
-                else if event.altKey
-                    fnk = "ALT"
-                
-                return unless fnk
-                r = app.shortcut fnk, c
-                event.preventDefault() if not r
             # desktop default file manager
             desktop = $ "#desktop"
             fp = _OS.setting.desktop.path.asFileHandler()
@@ -375,9 +378,4 @@ self.OS.GUI =
                         # TODO: get services list from user setting
                         _GUI.pushServices (v for v in _OS.setting.system.startup.services)
                         (_GUI.launch a) for a in _OS.setting.system.startup.apps
-                #_GUI.launch "DummyApp"
-
-        # startup application here
-        _courrier.observable.one "desktoploaded", () ->
-            #_GUI.launch "DummyApp"
-            #_GUI.launch "NotePad"
\ No newline at end of file
+                #_GUI.launch "DummyApp"
\ No newline at end of file