X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=src%2FJsRender%2FRoo.vala;h=25f003c592eac3c47b084f9f67e5cb399ecb0aa5;hb=HEAD;hp=c618f073bc5c24e7e4869834717ae8be39f68d69;hpb=22e5527f131948b3a843de00e42f5c1d0ef05019;p=app.Builder.js diff --git a/src/JsRender/Roo.vala b/src/JsRender/Roo.vala index c618f073b..25f003c59 100644 --- a/src/JsRender/Roo.vala +++ b/src/JsRender/Roo.vala @@ -28,7 +28,8 @@ namespace JsRender { this.xtype = "Roo"; this.language = "js"; - + this.content_type = ""; + //this.items = false; //if (cfg.json) { // var jstr = JSON.parse(cfg.json); @@ -45,7 +46,8 @@ namespace JsRender { //console.dump(this); // various loader methods.. - string[] dsp = { "title", + string[] dsp = { + "title", "legend", "loadingText", "emptyText", @@ -53,7 +55,14 @@ namespace JsRender { "value", "text", "emptyMsg", - "displayMsg" }; + "displayMsg", + "html", + "headline", + "header", + "placeholder", + "fieldLabel", + + }; for (var i=0;i 0 - ) { - this.tree = new Node(); - var ar = obj.get_array_member("items"); - var tree_base = ar.get_object_element(0); - this.tree.loadFromJson(tree_base, int.parse(bjs_version_str)); - } + + this.modOrder = this.jsonHasOrEmpty(obj, "modOrder"); + this.name = this.jsonHasOrEmpty(obj, "name"); + this.parent = this.jsonHasOrEmpty(obj, "parent"); + this.permname = this.jsonHasOrEmpty(obj, "permname"); + this.title = this.jsonHasOrEmpty(obj, "title"); + this.modOrder = this.jsonHasOrEmpty(obj, "modOrder"); + var bjs_version_str = this.jsonHasOrEmpty(obj, "bjs-version"); + bjs_version_str = bjs_version_str == "" ? "1" : bjs_version_str; + + + // load items[0] ??? into tree... + if (obj.has_member("items") + && + obj.get_member("items").get_node_type() == Json.NodeType.ARRAY + && + obj.get_array_member("items").get_length() > 0 + ) { + this.tree = new Node(); + var ar = obj.get_array_member("items"); + var tree_base = ar.get_object_element(0); + this.tree.loadFromJson(tree_base, int.parse(bjs_version_str)); + } + this.loaded = true; + this.toSource(); // force it to number the lines... } - /** - * old code had broken xtypes and used arrays differently, - * this code should try and clean it up.. - * - * - * / - fixItems : function(node, fixthis) - { - if (fixthis) { - // fix xtype. - var fn = this.guessName(node); - //print("guessname got " + fn); - if (fn) { - var bits = fn.split('.'); - node.xtype = bits.pop(); - node['|xns'] = bits.join('.'); - - } - // fix array??? - - - } - if (!node.items || !node.items.length) { - return; - } - var _this = this; - var aitems = []; - var nitems = []; - node.items.forEach(function(i) { - - - - _this.fixItems(i, true); - if (i.xtype == 'Array') { - aitems.push(i); - return; - } - nitems.push(i); - }); - node.items = nitems; - - if (!aitems.length) { - return; - } - - aitems.forEach(function(i) { - - if (!i.items || !i.items.length) { - return; - } - var prop = i['*prop'] + '[]'; - // colModel to cm? - i.items.forEach(function(c) { - c['*prop'] = prop; - node.items.push(c); - - }); - - - }); - - - // array handling.. - - - - - - }, - */ + public override void save() - { + { - print("--- JsRender.Roo.save"); - + GLib.debug("--- JsRender.Roo.save"); + GLib.debug("save() - reset transStrings\n"); this.transStrings = new Gee.HashMap(); this.findTransStrings(this.tree); @@ -249,7 +176,7 @@ namespace JsRender { - } + } @@ -258,12 +185,12 @@ namespace JsRender { { var top = this.tree.fqn(); - print ("TOP = " + top + "\n" ); - if (top.index_of("Roo.bootstrap.") < 0 && - top.index_of("Roo.mailer.") < 0 - ) { - return; - } + GLib.debug ("TOP = " + top + "\n" ); + if (top.index_of("Roo.bootstrap.") < 0 && + top.index_of("Roo.mailer.") < 0 + ) { + return; + } //now write the js file.. @@ -288,7 +215,7 @@ namespace JsRender { print("Skip save - templates folder does not exist : %s\n", targetdir); return; } - print("SAVE HTML -- %s\n%s\n",targetdir + "/" + bn, html); + //print("SAVE HTML -- %s\n%s\n",targetdir + "/" + bn, html); try { this.writeFile(targetdir + "/" + bn , html); } catch (FileError e ) { @@ -314,7 +241,7 @@ namespace JsRender { - public void findTransStrings(Node node ) + public override void findTransStrings(Node? node ) { // iterate properties... // use doubleStringProps @@ -342,17 +269,24 @@ namespace JsRender { if (kflag == "$") { continue; } + // skip cms-id nodes... + if (kname == "html" && node.has("cms-id")) { + continue; + } + var str = iter.get_value(); if (this.doubleStringProps.index_of(kname) > -1) { + GLib.debug("flag=%s type=%s name=%s : %s\n", kflag,ktype,kname,str); this.transStrings.set(str, - GLib.Checksum.compute_for_string (ChecksumType.MD5, str) + GLib.Checksum.compute_for_string (ChecksumType.MD5, str.strip()) ); continue; } - print("flag=%s type=%s name=%s\n", kflag,ktype,kname); - if (ktype.ascii_casecmp("string") == 0 && kname[0] == '_') { + + if (ktype.down() == "string" && kname[0] == '_') { + GLib.debug("flag=%s type=%s name=%s : %s\n", kflag,ktype,kname,str); this.transStrings.set(str, - GLib.Checksum.compute_for_string (ChecksumType.MD5, str) + GLib.Checksum.compute_for_string (ChecksumType.MD5, str.strip()) ); continue; } @@ -371,18 +305,21 @@ namespace JsRender { public string transStringsToJs() { + + GLib.debug("Roo.transStringsToJs()\n"); if (this.transStrings.size < 1) { + GLib.debug("Roo.transStringsToJs() size < 1?\n"); return ""; } - string ret = " strings : {\n"; + string[] kvs = {}; var iter = this.transStrings.map_iterator(); while (iter.next()) { - kvs += " " + (this.tree.quoteString(iter.get_value()) + ":" + + kvs += (" '" + iter.get_value() + "' :" + this.tree.quoteString(iter.get_key()) - ) + ); } - return " strings : {\n " + string.joinv(",\n", kvs) + "\n" + + return " _strings : {\n" + string.joinv(",\n", kvs) + "\n" + " },"; @@ -396,10 +333,15 @@ namespace JsRender { public override string toSourcePreview() { + print("toSourcePreview() - reset transStrings\n"); + this.transStrings = new Gee.HashMap(); + + print("to source preview\n"); if (this.tree == null) { return ""; } + this.findTransStrings(this.tree); var top = this.tree.fqn(); var xinc = new Gee.ArrayList(); @@ -416,6 +358,7 @@ namespace JsRender { } sf.loadItems(); + sf.findTransStrings(sf.tree); var xinc_str = sf.toSource(); //string xinc_str; @@ -449,7 +392,7 @@ namespace JsRender { } - + public override void setSource(string str) {} /** * This needs to use some options on the project * to determine how the file is output.. @@ -458,6 +401,13 @@ namespace JsRender { * * */ + public override string toSourceCode() + { + this.transStrings = new Gee.HashMap(); + this.findTransStrings(this.tree); + return this.toSource(); + } + public override string toSource() { // dump the file tree back out to a string. @@ -473,10 +423,14 @@ namespace JsRender { if (top == null) { return ""; } - // get the translatable strings.. + // get the translatable strings.. = we reload them again so calling methods get the right data... + this.transStrings = new Gee.HashMap(); + this.findTransStrings(this.tree); + + if (top.contains("Dialog")) { return this.toSourceDialog(false); } @@ -492,6 +446,44 @@ namespace JsRender { */ } + + /** + * + * munge JSON tree into Javascript code. + * + * NOTE - needs a deep copy of original tree, before starting.. + * - so that it does not modify current.. + * + * FIXME: + or / prefixes to properties hide it from renderer. + * FIXME: '*props' - not supported by this.. ?? - upto rendering code.. + * FIXME: needs to understand what properties might be translatable (eg. double quotes) + * + * @arg {object} obj the object or array to munge.. + * @arg {boolean} isListener - is the array being sent a listener.. + * @arg {string} pad - the padding to indent with. + */ + + public string mungeToStringWrap(string pad, string prefix, string suffix) + { + if (this.tree == null) { + return ""; + } + var x = new NodeToJs(this.tree, this.doubleStringProps, pad, null); + x.renderer = this; + x.cur_line = prefix.split("\n").length; + + var ret = x.munge(); + //var nret = x.ret; + + // output both files.. so we can diff them... + //this.writeFile("/tmp/old.js", ret); + //this.writeFile("/tmp/new.js", nret); + return prefix + ret + suffix; + + + } + + public string outputHeader() { @@ -524,8 +516,7 @@ namespace JsRender { //var items = JSON.parse(JSON.stringify(this.items[0])); - var o = this.mungeToString(" "); - + string[] adda = { " = {", "", @@ -562,20 +553,28 @@ namespace JsRender { "};", "" }; - return this.outputHeader() + "\n" + - this.name + string.joinv("\n", adda) + o + string.joinv("\n", addb); - + + return this.mungeToStringWrap(" ", + this.outputHeader() + "\n" + this.name + string.joinv("\n", adda), //header + string.joinv("\n", addb) // footer + ); + } + /** + Bootstrap modal dialog + + */ + public string toSourceModal(bool isPreview) { //var items = JSON.parse(JSON.stringify(this.items[0])); - var o = this.mungeToString(" "); + string[] adda = { " = {", "", @@ -612,12 +611,17 @@ namespace JsRender { "};", "" }; - return this.outputHeader() + "\n" + - this.name + string.joinv("\n", adda) + o + string.joinv("\n", addb); + return this.mungeToStringWrap(" ", + this.outputHeader() + "\n" + this.name + string.joinv("\n", adda), // header + string.joinv("\n", addb) // footer + ); } + + + public string pathToPart() @@ -652,11 +656,14 @@ namespace JsRender { // topItem.background = false; } - var o = this.mungeToString(" "); - var reg = new Regex("[^A-Za-z.]+"); - - string modkey = this.modOrder + "-" + reg.replace(this.name, this.name.length, 0 , "-"); + var modkey = this.modOrder + "-" + this.name; + try { + var reg = new Regex("[^A-Za-z.]+"); + modkey = this.modOrder + "-" + reg.replace(this.name, this.name.length, 0 , "-"); + } catch (RegexError e) { + //noop.. + } string parent = (this.parent.length > 0 ? "'" + this.parent + "'" : "false"); @@ -664,8 +671,8 @@ namespace JsRender { if (isPreview) { // set to false to ensure this is the top level.. parent = "false"; - var topnode = this.tree.fqn(); - print("topnode = %s\n", topnode); + var topnode = this.tree.fqn(); + print("topnode = %s\n", topnode); if (GLib.Regex.match_simple("^Roo\\.bootstrap\\.",topnode) && topnode != "Roo.bootstrap.Body" ) { @@ -674,14 +681,14 @@ namespace JsRender { } - - return - this.outputHeader() + "\n" + + + + var pref = this.outputHeader() + "\n" + this.name + " = new Roo.XComponent({\n" + - "" - this.transStringsToJs() , - "", + "\n" + + this.transStringsToJs() + "\n" + + "\n" + " part : "+ this.pathToPart() + ",\n" + /// critical used by builder to associate modules/parts/persm " order : '" +modkey+"',\n" + @@ -696,10 +703,13 @@ namespace JsRender { " {\n" + " var _this = this;\n" + // bc " var MODULE = this;\n" + /// this looks like a better name. - " return " + o + ";" + + " return "; + + return this.mungeToStringWrap(" ", pref, ";" + " }\n" + - "});\n"; - + "});\n" + ); + }