From 74f8eed243f123e85c22c6087b49d5e2bdcde4e9 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Fri, 19 Sep 2014 19:31:48 +0800 Subject: [PATCH] sync --- JsRender/NodeToJs.vala | 8 +++ resources/roo.builder.js | 8 +-- tests/JsCoreTest.vala.c | 115 --------------------------------------- 3 files changed, 11 insertions(+), 120 deletions(-) delete mode 100644 tests/JsCoreTest.vala.c diff --git a/JsRender/NodeToJs.vala b/JsRender/NodeToJs.vala index 60709d0ff..9826e3e89 100644 --- a/JsRender/NodeToJs.vala +++ b/JsRender/NodeToJs.vala @@ -198,6 +198,14 @@ public class JsRender.NodeToJs : Object { { string left; Regex func_regex ; + + if (this.node.props.has_key("$ xns")) { + + this.els.add("'|xns' : '" + this.node.props.get("$ xns") + "'"); + + } + + try { func_regex = new Regex("^\\s+|\\s+$"); } catch (Error e) { diff --git a/resources/roo.builder.js b/resources/roo.builder.js index 2f4ef8baf..720639820 100644 --- a/resources/roo.builder.js +++ b/resources/roo.builder.js @@ -4,11 +4,6 @@ // IPC: - via alert("IPC:{method}:{data} -Roo.XComponent.on("buildcomplete", function() { - - Builder.saveHTML.defer(100, Builder); -} ); - var MODULE = { isBuilder : true }; // BC var _this = MODULE; @@ -331,6 +326,7 @@ Builder = { tree.el.attr('flexy:include', tree['flexy:include']); } + tree.el.attr('xtype', tree['|xns'] + '.' + tree['xtype']); if (!tree.items || !tree.items.length) { return; } for (var i = 0; i < tree.items.length; i++){ @@ -346,4 +342,6 @@ Roo.XComponent.on('buildcomplete', function() { Roo.log("xcomponent built!"); var m = Roo.XComponent.modules; Builder.applyFlexy(m[m.length-1].el); + + Builder.saveHTML.defer(100, Builder); }); \ No newline at end of file diff --git a/tests/JsCoreTest.vala.c b/tests/JsCoreTest.vala.c deleted file mode 100644 index 70c85497b..000000000 --- a/tests/JsCoreTest.vala.c +++ /dev/null @@ -1,115 +0,0 @@ -/* JsCoreTest.vala.c generated by valac 0.22.1, the Vala compiler - * generated from JsCoreTest.vala, do not modify */ - - -#include -#include -#include -#include -#include -#include - - -#define PROJECT_TYPE_PROJECT (project_project_get_type ()) -#define PROJECT_PROJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PROJECT_TYPE_PROJECT, ProjectProject)) -#define PROJECT_PROJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PROJECT_TYPE_PROJECT, ProjectProjectClass)) -#define PROJECT_IS_PROJECT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PROJECT_TYPE_PROJECT)) -#define PROJECT_IS_PROJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PROJECT_TYPE_PROJECT)) -#define PROJECT_PROJECT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PROJECT_TYPE_PROJECT, ProjectProjectClass)) - -typedef struct _ProjectProject ProjectProject; -typedef struct _ProjectProjectClass ProjectProjectClass; - -#define JS_RENDER_TYPE_LANGCLASS (js_render_langclass_get_type ()) -#define JS_RENDER_LANGCLASS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), JS_RENDER_TYPE_LANGCLASS, JsRenderLang_Class)) -#define JS_RENDER_LANGCLASS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), JS_RENDER_TYPE_LANGCLASS, JsRenderLang_ClassClass)) -#define JS_RENDER_IS_LANGCLASS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), JS_RENDER_TYPE_LANGCLASS)) -#define JS_RENDER_IS_LANGCLASS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), JS_RENDER_TYPE_LANGCLASS)) -#define JS_RENDER_LANGCLASS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), JS_RENDER_TYPE_LANGCLASS, JsRenderLang_ClassClass)) - -typedef struct _JsRenderLang_Class JsRenderLang_Class; -typedef struct _JsRenderLang_ClassClass JsRenderLang_ClassClass; -#define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL))) - -#define PALETE_TYPE_PALETE (palete_palete_get_type ()) -#define PALETE_PALETE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), PALETE_TYPE_PALETE, PaletePalete)) -#define PALETE_PALETE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), PALETE_TYPE_PALETE, PaletePaleteClass)) -#define PALETE_IS_PALETE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PALETE_TYPE_PALETE)) -#define PALETE_IS_PALETE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PALETE_TYPE_PALETE)) -#define PALETE_PALETE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), PALETE_TYPE_PALETE, PaletePaleteClass)) - -typedef struct _PaletePalete PaletePalete; -typedef struct _PaletePaleteClass PaletePaleteClass; -#define _g_free0(var) (var = (g_free (var), NULL)) - - -extern ProjectProject* proj; -ProjectProject* proj = NULL; - -GType project_project_get_type (void) G_GNUC_CONST; -gint _vala_main (gchar** args, int args_length1); -JsRenderLang_Class* js_render_langclass_new (void); -JsRenderLang_Class* js_render_langclass_construct (GType object_type); -GType js_render_langclass_get_type (void) G_GNUC_CONST; -GType palete_palete_get_type (void) G_GNUC_CONST; -PaletePalete* palete_factory (const gchar* xtype); -gchar* palete_palete_validateCode (PaletePalete* self, const gchar* code, const gchar* language); - - -gint _vala_main (gchar** args, int args_length1) { - gint result = 0; - JsRenderLang_Class* _tmp0_ = NULL; - JsRenderLang_Class* _tmp1_ = NULL; - PaletePalete* r = NULL; - PaletePalete* _tmp2_ = NULL; - gchar* res = NULL; - gchar* _tmp3_ = NULL; - gchar* _tmp4_ = NULL; -#line 10 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - gtk_init (&args_length1, &args); -#line 11 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - gtk_clutter_init (&args_length1, &args); -#line 12 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _tmp0_ = js_render_langclass_new (); -#line 12 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _tmp1_ = _tmp0_; -#line 12 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _g_object_unref0 (_tmp1_); -#line 13 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - g_log_set_always_fatal (G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL); -#line 15 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _tmp2_ = palete_factory ("Roo"); -#line 15 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - r = _tmp2_; -#line 16 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _tmp3_ = palete_palete_validateCode (r, "if (true) { alert('test'); }", "javascript"); -#line 16 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - res = _tmp3_; -#line 20 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _tmp4_ = palete_palete_validateCode (r, "\nif (true) { \n alert('test'); \n}\n\n{ a syntax error ", "javascript"); -#line 20 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _g_free0 (res); -#line 20 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - res = _tmp4_; -#line 31 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - result = 0; -#line 31 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _g_free0 (res); -#line 31 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - _g_object_unref0 (r); -#line 31 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - return result; -#line 103 "JsCoreTest.vala.c" -} - - -int main (int argc, char ** argv) { -#line 9 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - g_type_init (); -#line 9 "/home/edward/gitlive/app.Builder.js/tests/JsCoreTest.vala" - return _vala_main (argv, argc); -#line 112 "JsCoreTest.vala.c" -} - - - -- 2.39.2