From 1fe69300e6015e3d790c2a8e4acb5c92abfeb479 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 8 Jun 2016 17:44:38 +0800 Subject: [PATCH] src/Palete/Palete.vala --- src/Palete/Palete.vala | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/Palete/Palete.vala b/src/Palete/Palete.vala index 0eca60566..40955b56a 100644 --- a/src/Palete/Palete.vala +++ b/src/Palete/Palete.vala @@ -413,14 +413,14 @@ namespace Palete if (ptype == "file") { - this.validateJavascriptCompression(code); + this.validateJavascriptCompression(file, code); } print("no errors\n"); return ret; } - public void validateJavascriptCompression(string code) + public void validateJavascriptCompression(JsRender.JsRender file, string code) { // this uses the roojspacker code to try and compress the code. // it should highlight errors before we actually push live the code. @@ -434,13 +434,10 @@ namespace Palete p.cleanup = false; var estr = ""; var ret = new Gee.HashMap(); - try { - p.packFile(code, "ANONFILE",""); - } catch (JSDOC.TokenReaderError e) { - estr = e.message; - } catch (JSDOC.ScopeParserError e) { - estr = e.message; - } + + p.packFile(code, "ANONFILE",""); + if (p.hasErrors("")) { + if (estr.length > 0 ) { var bits = estr.split(","); -- 2.39.2