From a2c6b787f7794f552b56fd53f9758bcd1c1026ab Mon Sep 17 00:00:00 2001 From: JesseBrault0709 <62299747+JesseBrault0709@users.noreply.github.com> Date: Sun, 12 May 2024 11:56:10 +0200 Subject: [PATCH] Fixed Echo bug with attr only being resolved on itself. --- web-views/sketching/echoElement.wvc | 2 +- web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/web-views/sketching/echoElement.wvc b/web-views/sketching/echoElement.wvc index 3ab94a3..0ecc654 100644 --- a/web-views/sketching/echoElement.wvc +++ b/web-views/sketching/echoElement.wvc @@ -1,4 +1,4 @@ --- import groowt.view.web.lib.Echo --- -

$greeting

+

$cliGreeting

diff --git a/web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy b/web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy index 89b65ce..416e21e 100644 --- a/web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy +++ b/web-views/src/main/groovy/groowt/view/web/lib/Echo.groovy @@ -15,8 +15,12 @@ class Echo extends DelegatingWebViewComponent { Object getProperty(String propertyName) { try { return super.getProperty(propertyName) - } catch (MissingPropertyException ignored) { - return attr[propertyName] + } catch (MissingPropertyException missingPropertyException) { + if (this.attr.containsKey(propertyName)) { + return this.attr[propertyName] + } else { + throw missingPropertyException + } } }