projects
/
app.Builder.js
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e52f7d0
)
src/Palete/Palete.vala
author
Alan Knowles
<alan@roojs.com>
Wed, 8 Jun 2016 09:45:50 +0000
(17:45 +0800)
committer
Alan Knowles
<alan@roojs.com>
Wed, 8 Jun 2016 09:45:50 +0000
(17:45 +0800)
src/Palete/Palete.vala
patch
|
blob
|
history
diff --git
a/src/Palete/Palete.vala
b/src/Palete/Palete.vala
index
7dbb7c7
..
a9a3cf9
100644
(file)
--- a/
src/Palete/Palete.vala
+++ b/
src/Palete/Palete.vala
@@
-395,7
+395,7
@@
namespace Palete
var lines_obj = new Json.Object();
var lines_ar = new Json.Array();
lines_ar.add_string_element(errmsg);
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);
+ lines_obj.set_array_member(line
.to_string()
, lines_ar);
files_obj.set_object_member(file.filename, lines_obj);
err.set_object_member("ERR", files_obj);
files_obj.set_object_member(file.filename, lines_obj);
err.set_object_member("ERR", files_obj);
@@
-413,14
+413,14
@@
namespace Palete
if (ptype == "file") {
if (ptype == "file") {
- this.validateJavascriptCompression(file, code);
+ this.validateJavascriptCompression(file,
state,
code);
}
print("no errors\n");
return ret;
}
}
print("no errors\n");
return ret;
}
- public void validateJavascriptCompression(JsRender.JsRender file, 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.
{
// this uses the roojspacker code to try and compress the code.
// it should highlight errors before we actually push live the code.
@@
-435,8
+435,10
@@
namespace Palete
var estr = "";
var ret = new Gee.HashMap<int,string>();
var estr = "";
var ret = new Gee.HashMap<int,string>();
- p.packFile(code, file.filname,"");
- if (p.hasErrors("")) {
+ p.packFile(code, file.filename,"");
+ if (!p.hasErrors("")) {
+ state.showCompileResult(err);
+ }
if (estr.length > 0 ) {
if (estr.length > 0 ) {