fly/fgdata
1
0
Fork 0
Code Activity

call Dialog.load() from the new() constructor already

Browse source
This commit is contained in:
mfranz 2006-08-25 20:13:58 +00:00
parent b6fb9d031a
commit 74b5436cde
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Nasal/gui.nas
View file

@ -163,14 +163,14 @@ Dialog = {
m.path = path;
m.prop = isa(props.Node, prop) ? prop : props.globals.getNode(prop, 1);
m.state = 0;
m.loaded = 0;
if (m.prop.getName() != "dialog") {
die("Dialog class: node name must end with '/dialog'");
}
m.load();
return m;
},
# doesn't need to be called explicitly, but can be used to force a reload
load : func {
if (me.prop.getName() != "dialog") {
die("Dialog class: node name must be 'dialog'");
}
fgcommand("loadxml", props.Node.new({"filename": me.path,
"targetnode": me.prop.getPath()}));
var name = me.prop.getNode("name");
@ -179,12 +179,8 @@ Dialog = {
}
me.prop.getNode("dialog-name", 1).setValue(name.getValue());
fgcommand("dialog-new", me.prop);
me.loaded = 1;
},
open : func {
if (!me.loaded) {
me.load(me.prop, me.path);
}
fgcommand("dialog-show", me.prop);
me.state = 1;
},