diff --git a/app.js b/app.js index fee724c..a2ab50b 100644 --- a/app.js +++ b/app.js @@ -42,8 +42,17 @@ var exit = function(status) { var console = { _messages: [], + _join: function(args, sep) { + args = args || []; + sep = sep || ' '; + var res = ''; + for (var i = args.length - 1; i > -1; i--) { + res = (i ? sep : '') + args[i] + res; + } + return res; + }, _echo: function(args, type) { - msg = (typeof(type) !== "undefined" ? type + ": " : "") + args[0]; + msg = (typeof(type) !== "undefined" ? type + ": " : "") + this._join(args); if (typeof(WScript) !== "undefined") { WScript.echo(" * " + msg); } diff --git a/lib/file.js b/lib/file.js index 3a58d1a..715f6e4 100644 --- a/lib/file.js +++ b/lib/file.js @@ -40,7 +40,7 @@ var readFile = function(FN, charset) { fsT = null; return T; } catch (e) { - console.error("readFile -> " + e.message); + console.error("readFile -> ", e.message); } } }; @@ -136,7 +136,7 @@ var FileObject = function() { this.isDirectory = true; } } catch (e) { - console.error("FileObject.exists() -> " + e.message); + console.error("FileObject.exists() -> ", e.message); } return this.isExists; }; @@ -150,10 +150,14 @@ var FileObject = function() { }; this.getDetails = function() { - if (this.isFile) { - return this.interface.GetFile(this.filename); - } else if (this.isDirectory) { - return this.interface.GetFolder(this.filename); + try { + if (this.isFile) { + return this.interface.GetFile(this.filename); + } else if (this.isDirectory) { + return this.interface.GetFolder(this.filename); + } + } catch (e) { + console.error("FileObject.getDetails() -> ", e.message); } }; @@ -211,7 +215,9 @@ var FileObject = function() { }; this.mkdir = function() { - return this.interface.CreateFolder(this.filename); + if (this.isDirectory) { + return this.interface.CreateFolder(this.filename); + } }; this.close = function() { diff --git a/webloader.js b/webloader.js index f6dcbcd..8501e32 100644 --- a/webloader.js +++ b/webloader.js @@ -8,8 +8,8 @@ var OldBrowser = require("lib/oldbrowser"); //////////////////////////////////////////////////////////////////////// // Override global.console._echo() //////////////////////////////////////////////////////////////////////// -global.console._echo = function(msg, type) { - var heading, icon; +global.console._echo = function(args, type) { + var heading, icon, msg = this._join(args); switch(type) { case "error": @@ -29,19 +29,24 @@ global.console._echo = function(msg, type) { default: heading = "Success"; icon = "success"; + return; } - if (typeof(window.jQuery) !== "undefined") { - window.jQuery.toast({ - heading: heading, - text: msg, - icon: icon - }); - } else { - window.alert(msg); + try { + if (typeof(window.jQuery.toast) !== "undefined") { + window.jQuery.toast({ + heading: heading, + text: msg, + icon: icon + }); + } else { + window.alert(msg); + } + } catch (e) { + window.alert(e.message); } - global.console._messages.push(msg); + this._messages.push(msg); }; ////////////////////////////////////////////////////////////////////////