diff --git a/src/core/gui.coffee b/src/core/gui.coffee index b41e81c..3263b76 100644 --- a/src/core/gui.coffee +++ b/src/core/gui.coffee @@ -107,20 +107,21 @@ self.OS.GUI = js = path + "/main.js" js.asFileHandler().read (d) -> - #load css file - css = "#{path}/main.css" - css.asFileHandler().onready (d) -> - el = $ '', { rel: 'stylesheet', type: 'text/css', 'href': "#{_API.handler.get}/#{css}" } - .appendTo 'head' - _OS.APP[app].style = el[0] if _OS.APP[app] - , () -> - #launch # load app meta data "#{path}/package.json".asFileHandler().read (data) -> data.path = path _OS.APP[app].meta = data if _OS.APP[app] _OS.APP[v].meta = data for v in data.services if data.services - ok app + #load css file + css = "#{path}/main.css" + css.asFileHandler().onready (d) -> + el = $ '', { rel: 'stylesheet', type: 'text/css', 'href': "#{_API.handler.get}/#{css}" } + .appendTo 'head' + _OS.APP[app].style = el[0] if _OS.APP[app] + ok app + , () -> + #launch + ok app , "json" #ok app , "script" diff --git a/src/core/handlers/RemoteHandler.coffee b/src/core/handlers/RemoteHandler.coffee index 2424e9c..bca1db1 100644 --- a/src/core/handlers/RemoteHandler.coffee +++ b/src/core/handlers/RemoteHandler.coffee @@ -15,10 +15,11 @@ self.OS.API.handler = path = "#{_REST}/fs/mkdir" _API.post path, { path: p }, c, (e, s) -> _courrier.osfail "Fail to create directory: #{p}", e, s - sharefile: (p, c) -> + sharefile: (p, pub , c) -> path = "#{_REST}/fs/publish" - _API.post path, { path: p }, c, (e, s) -> + _API.post path, { path: p , publish: pub }, c, (e, s) -> _courrier.osfail "Fail to publish file: #{p}", e, s + fileinfo: (p, c) -> path = "#{_REST}/fs/fileinfo" _API.post path, { path: p }, c, (e, s) -> diff --git a/src/core/tags/afx-file-view.js b/src/core/tags/afx-file-view.js index 5460cc5..27b1bcb 100644 --- a/src/core/tags/afx-file-view.js +++ b/src/core/tags/afx-file-view.js @@ -142,7 +142,7 @@ } self.on("updated", function(){ refreshData() - calibre_size() + //calibre_size() }) self.on("mount", function(){ switchView() diff --git a/src/core/vfs.coffee b/src/core/vfs.coffee index 74f5c3b..1a99f5f 100644 --- a/src/core/vfs.coffee +++ b/src/core/vfs.coffee @@ -147,7 +147,7 @@ class RemoteFileHandler extends self.OS.API.VFS.BaseFileHandler when "remove" _API.handler.delete @path, f when "publish" - _API.handler.sharefile @path, f + _API.handler.sharefile @path, true , f when "download" return if @info.type is "dir" _API.handler.fileblob @path, (d) -> @@ -274,7 +274,7 @@ class SharedFileHandler extends self.OS.API.VFS.BaseFileHandler _API.handler.write @path, p, f when "remove" - _API.handler.delete @path, f + _API.handler.sharefile @basename, false, f when "upload" return diff --git a/src/themes/antos/wp2.jpg b/src/themes/antos/wp2.jpg index b87f702..7f0d2bf 100644 Binary files a/src/themes/antos/wp2.jpg and b/src/themes/antos/wp2.jpg differ