X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FPalete%2FPalete.vala;h=bf2555637c685edcfbd8b0f8d5fe48e15b22958a;hb=a07013f293957e32ea2a375d6ce0e79ea24032a9;hp=10a39c765d988d5e73c554a9e3c0970e8d97bd3a;hpb=3b622a1163fcca83a4b5614cf774796fbf6a29b3;p=app.Builder.js diff --git a/src/Palete/Palete.vala b/src/Palete/Palete.vala index 10a39c765..bf2555637 100644 --- a/src/Palete/Palete.vala +++ b/src/Palete/Palete.vala @@ -361,6 +361,7 @@ namespace Palete public Gee.HashMap validateJavascript( + WindowState state, string code, string property, string ptype, @@ -386,7 +387,28 @@ namespace Palete var line = Javascript.singleton().validate( testcode, out errmsg); - if (line < 0) { + if (line > -1) { + if (ptype == "file") { + var err = new Json.Object(); + err.set_int_member("ERR-TOTAL", 1); + var files_obj = new Json.Object(); + var lines_obj = new Json.Object(); + var lines_ar = new Json.Array(); + lines_ar.add_string_element(errmsg); + lines_obj.set_array_member(line, lines_ar); + files_obj.set_object_member(file.filename, lines_obj); + + err.set_object_member("ERR", files_obj); + err.set_object_member("ERR-TOTAL", 1); + state.showCompileResult(err); + return ret; + } + ret.set(line, errmsg); // depricated - this is used by the editor currently -- but we are planning to switch from taht. + print("got errors\n"); + return ret; + + } + if (ptype == "file") { return this.validateJavascriptCompression(code); }