fix system loading handle

This commit is contained in:
Xuan Sang LE 2020-05-21 14:49:55 +02:00
parent 52ac96c18a
commit f1c4201270
4 changed files with 16 additions and 8 deletions

View File

@ -54,6 +54,17 @@ class BaseApplication extends this.OS.GUI.BaseModel
path = "#{@meta().path}/scheme.html"
@.render path
load: (promise) ->
q = @_api.mid()
new Promise (resolve, reject) =>
@_api.loading q, @name
promise.then () =>
@_api.loaded q, @name, "OK"
resolve()
.catch (e) =>
@_api.loaded q, @name, "FAIL"
reject e
bindKey: (k, f) ->
arr = k.split "-"
return unless arr.length is 2

View File

@ -180,17 +180,14 @@ Ant.OS.GUI =
if not Ant.OS.APP[app]
# first load it
Ant.OS.GUI.loadApp(app).then (a) ->
console.log "apploaded"
Ant.OS.PM.createProcess a, Ant.OS.APP[a], args
.catch (e) ->
console.log e
Ant.OS.announcer.osfail __("Unable to launch: {0}", app), e
else
# now launch it
if Ant.OS.APP[app]
Ant.OS.PM.createProcess app, Ant.OS.APP[app], args
.catch (e) ->
console.log e
Ant.OS.announcer.osfail __("Unable to launch: {0}", app), e
dock: (app, meta) ->
# dock an application to a dock

View File

@ -32,9 +32,11 @@ class PushNotification extends this.OS.GUI.BaseService
if b and @iconclass is "fa fa-bars"
@iconclass = "fa fa-spinner fa-spin"
@update()
$(@_gui.workspace).css "cursor", "wait"
else if not b and @iconclass is "fa fa-spinner fa-spin"
@iconclass = "fa fa-bars"
@update()
$(@_gui.workspace).css "cursor", "auto"
main: ->
@mlist = @find "notifylist"
@ -51,14 +53,12 @@ class PushNotification extends this.OS.GUI.BaseService
@subscribe "loading", (o) =>
@pending.push o.id
$(@_gui.workspace).css "cursor", "wait"
@spin true
@subscribe "loaded", (o) =>
i = @pending.indexOf o.id
@pending.splice i, 1 if i >= 0
@spin false if @pending.length is 0
$(@_gui.workspace).css "cursor", "auto"
@nzone.set "height", "100%"
@fzone.set "height", "100%"

View File

@ -1,6 +1,6 @@
Ant = this
class BugListItemTag extends Ant.OS.GUI.tag["afx-list-item-proto"]
class BugListItemTag extends this.OS.GUI.tag["afx-list-item-proto"]
constructor: (r, o) ->
super r, o
@ -25,7 +25,7 @@ class BugListItemTag extends Ant.OS.GUI.tag["afx-list-item-proto"]
] }
Ant.OS.GUI.define "afx-bug-list-item", BugListItemTag
this.OS.GUI.define "afx-bug-list-item", BugListItemTag
class Syslog extends this.OS.GUI.BaseApplication
constructor: (args) ->