src/Builder4/PopoverProperty.bjs

src/Builder4/PopoverProperty.vala

diff --git a/src/Builder4/PopoverProperty.bjs b/src/Builder4/PopoverProperty.bjs
index f2bd80b..30c5c64 100644 (file)
--- a/src/Builder4/PopoverProperty.bjs
+++ b/src/Builder4/PopoverProperty.bjs
@@ -9,8 +9,9 @@
  "items" : [
   {
    "listeners" : {
-    "closed" : "() => {\n  if (!this.done) {\n    _this.el.show();\n  \n  }\n  \n  \n \n    print(\"ktype: %s\\n\",ktype);\n    switch(this.key_type) {\n        case \"listener\":\n            var ov = _this.node.listeners.get(oldval);\n            _this.node.listeners.set(newtext, ov);\n            _this.node.listeners.unset(oldval);\n            \n            _this.updateIter(iter,  ktype, newtext, ov);\n            \n            break;\n        case \"props\":\n            var ov = _this.node.props.get(oldval);\n            _this.node.props.set(newtext, ov);\n            _this.node.props.unset(oldval);\n            _this.updateIter(iter,  ktype, newtext, ov);\n            break;\n     }\n     _this.changed();\n  \n  \n} "
+    "closed" : "() => {\n  if (!this.done) {\n    _this.el.show();\n  \n  }\n  \n  \n \n    \n    switch(this.key_type) {\n        case \"listener\":\n            var ov = _this.node.listeners.get(this.old_keyname);\n            _this.node.listeners.set(newtext, ov);\n            _this.node.listeners.unset(this.old_keyname);\n            \n            _this.mainwindow.windowstate.leftprops.updateIter(iter,  ktype, newtext, ov);\n            \n            break;\n        case \"props\":\n            var ov = _this.node.props.get(oldval);\n            _this.node.props.set(newtext, ov);\n            _this.node.props.unset(oldval);\n            _this.updateIter(iter,  ktype, newtext, ov);\n            break;\n     }\n     _this.changed();\n  \n  \n} "
    },
+   "string old_keyname" : "",
    "id" : "PopoverProperty",
    "@ void success" : "(Project.Project pr, JsRender.JsRender file)",
    "| void show" : "(Gtk.Widget btn, JsRender.Node node, string key_type,  string key) \n\t{\n\t\n\tstring kname = \"\", kflag = \"\", ktype = \"\";\n\tif (key.length > 0) {\n\t\tnode.normalize_key( key, out  kname, out  kflag, out ktype);\n\t}\n\n\tif (key_type == \"listener\") {\n\t\tthis.header.el.title = \"Modify Event Listener\";\n\t} else {\n\t\tthis.header.el.title = \"Modify Property\";\n\t}\n\t\n\tthis.key_type = key_type;\n\n\t_this.kname.el.set_text(kname);\n\t_this.ktype.el.set_text(ktype);\n\t\n\t_this.dbmodel.loadData(kflag);\n\t// does node have this property...\n\n\n\tif (key.length > 0) {\n\t\tthis.save_btn.el.set_label(\"Save\");\n\t} else {\n\t\tthis.save_btn.el.set_label(\"Create\");\n\t}\n\n\t_this.node = node;\n\t//console.log('show all');\n\tthis.el.set_modal(true);\n\tthis.el.set_relative_to(btn);\n\n\tthis.el.set_position(Gtk.PositionType.TOP);\n\n\t// window + header?\n\t print(\"SHOWALL - POPIP\\n\");\n\tthis.el.show_all();\n\tthis.kname.el.grab_focus();\n\n\t//this.success = c.success;\n \n}",

diff --git a/src/Builder4/PopoverProperty.vala b/src/Builder4/PopoverProperty.vala
index 4519ea1..1c6f9eb 100644 (file)
--- a/src/Builder4/PopoverProperty.vala
+++ b/src/Builder4/PopoverProperty.vala
@@ -21,6 +21,7 @@ public class Xcls_PopoverProperty : Object
     public Xcls_save_btn save_btn;
 
         // my vars (def)
+    public string old_keyname;
     public signal void success (Project.Project pr, JsRender.JsRender file);
     public bool done;
     public Xcls_MainWindow mainwindow;
@@ -54,14 +55,14 @@ public class Xcls_PopoverProperty : Object
           
           
          
-            print("ktype: %s\n",ktype);
+            
             switch(this.key_type) {
                 case "listener":
-                    var ov = _this.node.listeners.get(oldval);
+                    var ov = _this.node.listeners.get(this.old_keyname);
                     _this.node.listeners.set(newtext, ov);
-                    _this.node.listeners.unset(oldval);
+                    _this.node.listeners.unset(this.old_keyname);
                     
-                    _this.updateIter(iter,  ktype, newtext, ov);
+                    _this.mainwindow.windowstate.leftprops.updateIter(iter,  ktype, newtext, ov);
                     
                     break;
                 case "props":