From 3d3ab299f26726a7ef832b1c3fcba0c770bade9d Mon Sep 17 00:00:00 2001 From: Alan Date: Wed, 31 Aug 2022 15:40:23 +0800 Subject: [PATCH] Support user defined properties in JS (BC for old files really?) --- debian/autoreconf.after | 6 +++--- debian/autoreconf.before | 4 ++-- src/Builder4/PopoverProperty.bjs | 7 ++++++- src/Builder4/PopoverProperty.vala | 7 ++++++- 4 files changed, 17 insertions(+), 7 deletions(-) diff --git a/debian/autoreconf.after b/debian/autoreconf.after index 82f5446d3..a10e6a0a2 100644 --- a/debian/autoreconf.after +++ b/debian/autoreconf.after @@ -161,7 +161,7 @@ a2ab047e446d2f0afbe9a7affa9bb2d2 ./src/JsRender/NodeToGtk.vala b0db69f542350bdc6b9ce878404d3f32 ./src/JsRender/JsRender.vala 2e854b1f569e75e6b54d0ba619b00515 ./src/JsRender/PlainFile.vala 3b001463dfd5e3a5349c2df61da7e4b7 ./src/JsRender/JsonGen.vala -e5847a45cc905cf33991e494622514a8 ./src/JsRender/NodeProp.vala +fcf5c8d1459fd82b8660ff5b34ade714 ./src/JsRender/NodeProp.vala 89c118453fd859cffb43da061a41cb6e ./src/JsRender/Roo.vala f38a04fb038a85a76ffaf9486feeef06 ./src/Makefile.in 1d3ffc09f9adcbbae424e15ded33c01f ./src/Application.vala @@ -237,7 +237,7 @@ d743438c4e4b765b7ce4b7e1c98b3b31 ./config.h.in~ 9580a33f9516167b4a1a72fe4fee31ae ./.gitignore 737061c1c974f84326be8b9281180af9 ./README.md 959bffe2993816eb32ec4bc1ec1d5875 ./LICENSE -2cfe346e64cead6f7cb807b27573b042 ./autom4te.cache/requests +d9036b941d8bca551dc5bcb519c5ffe3 ./autom4te.cache/requests 4ab5d64b369bac36c4c5ea81ef5e82f1 ./autom4te.cache/traces.2 4ab5d64b369bac36c4c5ea81ef5e82f1 ./autom4te.cache/traces.1 35d73aa64bd0b12a1f9172b40e9f62b2 ./autom4te.cache/output.1 @@ -245,7 +245,7 @@ d743438c4e4b765b7ce4b7e1c98b3b31 ./config.h.in~ 99d97fe84a1747c45d8bd23c7ab9b8c4 ./autom4te.cache/traces.0 35d73aa64bd0b12a1f9172b40e9f62b2 ./autom4te.cache/output.0 d32239bcb673463ab874e80d47fae504 ./COPYING -4faca3854c16b03e95d217f712032300 ./.gdb_history +3bae6454ef01e04f1c82c0766f1024c7 ./.gdb_history e194375eb17ee97cc2db1c3e680412a3 ./INSTALL.txt 234ae97ddd94d5596656997f26bdd94a ./AUTHORS e93be940bda9805b18b8ca846d2de2a3 ./resources/mailer.builder.html diff --git a/debian/autoreconf.before b/debian/autoreconf.before index 7835c8f64..28b4ef584 100644 --- a/debian/autoreconf.before +++ b/debian/autoreconf.before @@ -159,7 +159,7 @@ a2ab047e446d2f0afbe9a7affa9bb2d2 ./src/JsRender/NodeToGtk.vala b0db69f542350bdc6b9ce878404d3f32 ./src/JsRender/JsRender.vala 2e854b1f569e75e6b54d0ba619b00515 ./src/JsRender/PlainFile.vala 3b001463dfd5e3a5349c2df61da7e4b7 ./src/JsRender/JsonGen.vala -e5847a45cc905cf33991e494622514a8 ./src/JsRender/NodeProp.vala +fcf5c8d1459fd82b8660ff5b34ade714 ./src/JsRender/NodeProp.vala 89c118453fd859cffb43da061a41cb6e ./src/JsRender/Roo.vala 1d3ffc09f9adcbbae424e15ded33c01f ./src/Application.vala 37f5eed98ec91e1f290760bfa4273509 ./src/ccode/valaccodedostatement.vala @@ -234,7 +234,7 @@ fea4e03774fdd90e5211670458929188 ./src/Makefile.am 737061c1c974f84326be8b9281180af9 ./README.md 959bffe2993816eb32ec4bc1ec1d5875 ./LICENSE d32239bcb673463ab874e80d47fae504 ./COPYING -4faca3854c16b03e95d217f712032300 ./.gdb_history +3bae6454ef01e04f1c82c0766f1024c7 ./.gdb_history e194375eb17ee97cc2db1c3e680412a3 ./INSTALL.txt 234ae97ddd94d5596656997f26bdd94a ./AUTHORS e93be940bda9805b18b8ca846d2de2a3 ./resources/mailer.builder.html diff --git a/src/Builder4/PopoverProperty.bjs b/src/Builder4/PopoverProperty.bjs index e85622196..afdf4d59e 100644 --- a/src/Builder4/PopoverProperty.bjs +++ b/src/Builder4/PopoverProperty.bjs @@ -111,7 +111,12 @@ "\t", "\t\tel.append(out iter);", "\t\tel.set(iter, 0, JsRender.NodePropType.RAW, 1, \"Raw Property (not escaped)\", -1);", - "\t\t ", + "\t\t", + "\t\t// we appear to still use this?!? (builderCfg?)", + "\t\tel.append(out iter);", + "\t\tel.set(iter, 0, JsRender.NodePropType.USER, 1, \"User defined property\", -1);", + "\t\t", + "\t\t", "\t\tel.append(out iter);", "\t\tel.set(iter, 0, JsRender.NodePropType.METHOD, 1, \"User defined method\", -1);", "\t ", diff --git a/src/Builder4/PopoverProperty.vala b/src/Builder4/PopoverProperty.vala index 920a2789c..9bd762d00 100644 --- a/src/Builder4/PopoverProperty.vala +++ b/src/Builder4/PopoverProperty.vala @@ -405,7 +405,12 @@ public class Xcls_PopoverProperty : Object el.append(out iter); el.set(iter, 0, JsRender.NodePropType.RAW, 1, "Raw Property (not escaped)", -1); - + + // we appear to still use this?!? (builderCfg?) + el.append(out iter); + el.set(iter, 0, JsRender.NodePropType.USER, 1, "User defined property", -1); + + el.append(out iter); el.set(iter, 0, JsRender.NodePropType.METHOD, 1, "User defined method", -1); -- 2.39.2