From b6f1f05f269ad9d22ce75f6a60cd1f3cf793011e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 27 May 2015 16:15:23 +0800 Subject: [PATCH] src/JsRender/Gtk.vala src/JsRender/JsRender.vala src/JsRender/Roo.vala src/Builder4/Editor.bjs src/Builder4/Editor.vala --- src/Builder4/Editor.bjs | 2 +- src/Builder4/Editor.vala | 3 +-- src/JsRender/Gtk.vala | 2 +- src/JsRender/JsRender.vala | 2 +- src/JsRender/Roo.vala | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/Builder4/Editor.bjs b/src/Builder4/Editor.bjs index 684909774..c3c7a6aff 100644 --- a/src/Builder4/Editor.bjs +++ b/src/Builder4/Editor.bjs @@ -18,7 +18,7 @@ "# string key" : "\"\"", "* pack" : "add", "xtype" : "Box", - "| void show" : "(JsRender.JsRender file, JsRender.Node node, string ptype, string key)\n{\n this.file = file; \n this.ptype = \"\";\n this.key = \"\";\n this.node = null;\n\n \n if (file.xtype != \"PlainFile\") {\n \n this.ptype = ptype;\n this.key = key;\n this.node = node;\n string val = \"\";\n // find the text for the node..\n if (ptype == \"listener\") {\n val = node.listeners.get(key);\n \n } else {\n val = node.props.get(key);\n }\n this.view.load(val);\n\n \n } else {\n this.view.load( file.toSource() );\n\n }\n this.key_edit.el.text = key; \n \n \n\n}", + "| void show" : "(JsRender.JsRender file, JsRender.Node node, string ptype, string key)\n{\n this.file = file; \n this.ptype = \"\";\n this.key = \"\";\n this.node = null;\n\n \n if (file.xtype != \"PlainFile\") {\n \n this.ptype = ptype;\n this.key = key;\n this.node = node;\n string val = \"\";\n // find the text for the node..\n if (ptype == \"listener\") {\n val = node.listeners.get(key);\n \n } else {\n val = node.props.get(key);\n }\n this.view.load(val);\n\n \n } else {\n this.view.load( file.toSource() );\n\n }\n this.key_edit.el.text = key; \n \n \n}", "# JsRender.JsRender file" : "null", "# bool pos" : false, "string id" : "Editor", diff --git a/src/Builder4/Editor.vala b/src/Builder4/Editor.vala index 044f364db..e396e7ef7 100644 --- a/src/Builder4/Editor.vala +++ b/src/Builder4/Editor.vala @@ -130,8 +130,7 @@ public class Editor : Object } this.key_edit.el.text = key; - - + } public class Xcls_Box2 : Object { diff --git a/src/JsRender/Gtk.vala b/src/JsRender/Gtk.vala index 74af89c64..e40f4f097 100644 --- a/src/JsRender/Gtk.vala +++ b/src/JsRender/Gtk.vala @@ -126,7 +126,7 @@ namespace JsRender { { return ""; } - public override string setSource(string str) {} + public override void setSource(string str) {} public override string toSource() { diff --git a/src/JsRender/JsRender.vala b/src/JsRender/JsRender.vala index cb658486b..a84213564 100644 --- a/src/JsRender/JsRender.vala +++ b/src/JsRender/JsRender.vala @@ -363,7 +363,7 @@ namespace JsRender { public abstract void save(); public abstract void saveHTML(string html); public abstract string toSource() ; - public abstract string setSource(string str); + public abstract void setSource(string str); public abstract string toSourcePreview() ; public abstract void removeFiles() ; public abstract void findTransStrings(Node? node ); diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala index 13c950d0b..ac616c9fd 100644 --- a/src/JsRender/Roo.vala +++ b/src/JsRender/Roo.vala @@ -467,7 +467,7 @@ namespace JsRender { } - public override string setSource(string str) {} + public override void setSource(string str) {} /** * This needs to use some options on the project * to determine how the file is output.. -- 2.39.2