this.xtype = "Roo";
this.language = "js";
-
+ this.content_type = "";
+
//this.items = false;
//if (cfg.json) {
// var jstr = JSON.parse(cfg.json);
"headline",
"header",
"placeholder",
+ "fieldLabel",
};
for (var i=0;i<dsp.length;i++) {
}
- /*
- setNSID : function(id)
- {
-
- this.items[0]['|module'] = id;
-
-
- },
-
-
- getType: function() {
- return 'Roo';
- },
-
- */
+
- public override void removeFiles() {
- var html = GLib.Path.get_dirname(this.path) +"/templates/" + name + ".html";
- if (FileUtils.test(html, FileTest.EXISTS)) {
- GLib.FileUtils.remove(html);
- }
- var js = GLib.Path.get_dirname(this.path) +"/" + name + ".html";
- if (FileUtils.test(js, FileTest.EXISTS)) {
- GLib.FileUtils.remove(js);
+ public override void removeFiles() {
+ var html = GLib.Path.get_dirname(this.path) +"/templates/" + name + ".html";
+ if (FileUtils.test(html, FileTest.EXISTS)) {
+ GLib.FileUtils.remove(html);
+ }
+ var js = GLib.Path.get_dirname(this.path) +"/" + name + ".html";
+ if (FileUtils.test(js, FileTest.EXISTS)) {
+ GLib.FileUtils.remove(js);
+ }
}
- }
public override void loadItems() throws GLib.Error // : function(cb, sync) == original was async.
{
-
- print("load Items!");
- if (this.tree != null) {
- return;
- }
- print("load " + this.path);
-
- var pa = new Json.Parser();
- pa.load_from_file(this.path);
- var node = pa.get_root();
-
- if (node.get_node_type () != Json.NodeType.OBJECT) {
- throw new Error.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
- }
- var obj = node.get_object ();
-
-
- 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");
+
+ GLib.debug("load Items!");
+ if (this.tree != null) {
+ return;
+ }
+ GLib.debug("load " + this.path);
- var bjs_version_str = this.jsonHasOrEmpty(obj, "bjs-version");
- bjs_version_str = bjs_version_str == "" ? "1" : bjs_version_str;
+ var pa = new Json.Parser();
+ pa.load_from_file(this.path);
+ var node = pa.get_root();
+ if (node.get_node_type () != Json.NodeType.OBJECT) {
+ throw new Error.INVALID_FORMAT ("Unexpected element type %s", node.type_name ());
+ }
+ var obj = node.get_object ();
- // 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.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");
- print("save() - reset transStrings\n");
+ GLib.debug("--- JsRender.Roo.save");
+ GLib.debug("save() - reset transStrings\n");
this.transStrings = new Gee.HashMap<string,string>();
this.findTransStrings(this.tree);
- }
+ }
{
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..
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 ) {
- public void findTransStrings(Node node )
+ public override void findTransStrings(Node? node )
{
// iterate properties...
// use doubleStringProps
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.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;
}
public string transStringsToJs()
{
- print("Roo.transStringsToJs()\n");
+ GLib.debug("Roo.transStringsToJs()\n");
if (this.transStrings.size < 1) {
- print("Roo.transStringsToJs() size < 1?\n");
+ GLib.debug("Roo.transStringsToJs() size < 1?\n");
return "";
}
}
sf.loadItems();
+ sf.findTransStrings(sf.tree);
var xinc_str = sf.toSource();
//string xinc_str;
}
-
+ public override void setSource(string str) {}
/**
* This needs to use some options on the project
* to determine how the file is output..
*
*
*/
+ public override string toSourceCode()
+ {
+ this.transStrings = new Gee.HashMap<string,string>();
+ this.findTransStrings(this.tree);
+ return this.toSource();
+ }
+
public override string toSource()
{
// dump the file tree back out to a string.
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<string,string>();
+ this.findTransStrings(this.tree);
+
+
if (top.contains("Dialog")) {
return this.toSourceDialog(false);
}
*/
}
+
+ /**
+ *
+ * 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()
{
//var items = JSON.parse(JSON.stringify(this.items[0]));
- var o = this.mungeToString(" ");
-
+
string[] adda = { " = {",
"",
"};",
""
};
- 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 = { " = {",
"",
"};",
""
};
- 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()
// 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");
}
-
- return
- this.outputHeader() + "\n" +
+
+
+ var pref = this.outputHeader() + "\n" +
this.name + " = new Roo.XComponent({\n" +
"\n" +
" {\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"
+ );
+
}
projects / app.Builder.js / blobdiff