diff --git a/apps/assets/scripts/main.js b/apps/assets/scripts/main.js index 8c61d84..6d34a36 100644 --- a/apps/assets/scripts/main.js +++ b/apps/assets/scripts/main.js @@ -1,4 +1,4 @@ -// Generated by CoffeeScript 2.4.1 +// Generated by CoffeeScript 2.5.1 (function() { var APIManager, BaseObject, MarkOn, WebVNC, require; @@ -21,14 +21,14 @@ /* window.require = (lib) -> - return new Promise (r, e) -> - return r() if window.libraries[lib] - $.getScript window.myuri + lib - .done (d) -> - window.libraries[lib] = true - r() - .fail (m, s) -> - e(m, s) */ + return new Promise (r, e) -> + return r() if window.libraries[lib] + $.getScript window.myuri + lib + .done (d) -> + window.libraries[lib] = true + r() + .fail (m, s) -> + e(m, s) */ // private function require = function(lib) { return new Promise(function(r, e) { diff --git a/os/controllers/SystemController.lua b/os/controllers/SystemController.lua index 06ddcd9..be7c89e 100644 --- a/os/controllers/SystemController.lua +++ b/os/controllers/SystemController.lua @@ -101,8 +101,8 @@ function SystemController:apigateway(...) -- override the global echo command echo = std.ws.swrite use_ws = true - else - std.json() + --else + -- std.json() end local exec_with_user_priv = function(data) local uid = ulib.uid(SESSION.user) diff --git a/os/libs/vfs.lua b/os/libs/vfs.lua index 7ba6149..bb1f581 100644 --- a/os/libs/vfs.lua +++ b/os/libs/vfs.lua @@ -61,7 +61,7 @@ end vfs.mkdir = function(path) local file = std.basename(path) - local folder = string.gsub(path, utils.escape_pattern(file),"") + local folder = string.gsub(path, utils.escape_pattern(file).."$","") local r,m = vfs.checkperm(folder,"write") if r then