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);
+ lines_obj.set_array_member(line.to_string(), lines_ar);
+ files_obj.set_object_member(file.path, lines_obj);
err.set_object_member("ERR", files_obj);
- err.set_object_member("ERR-TOTAL", 1);
+
state.showCompileResult(err);
return ret;
}
if (ptype == "file") {
- this.validateJavascriptCompression(code);
+ this.validateJavascriptCompression(file, state, code);
}
print("no errors\n");
return ret;
}
- public void validateJavascriptCompression(string code)
+ public void validateJavascriptCompression(JsRender.JsRender file, WindowState state, string code)
{
// this uses the roojspacker code to try and compress the code.
// it should highlight errors before we actually push live the code.
p.cleanup = false;
var estr = "";
var ret = new Gee.HashMap<int,string>();
- try {
- p.packFile(code, "ANONFILE","");
- } catch (JSDOC.TokenReaderError e) {
- estr = e.message;
- } catch (JSDOC.ScopeParserError e) {
- estr = e.message;
+
+ p.packFile(code, file.path,"");
+ if (!p.hasErrors("")) {
+ state.showCompileResult(new Json.Object());
}
+
if (estr.length > 0 ) {
var bits = estr.split(",");