Merge f1bad1a into 92bca23

openhab · Feb 10, 2023 · 533b464 · 533b464
2 parents 92bca23 + f1bad1a
commit 533b464
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/bundles/org.openhab.ui/web/src/components/widgets/widget-mixin.js b/bundles/org.openhab.ui/web/src/components/widgets/widget-mixin.js
@@ -58,11 +58,11 @@ export default {
     },
     config () {
       if (!this.context || !this.context.component) return null
-      const sourceConfig = this.context.component.config
       let evalConfig = {}
       if (this.context.component.config) {
-        if (typeof this.context.component.config !== 'object') return {}
-        for (const key in this.context.component.config) {
+        const sourceConfig = this.context.component.config
+        if (typeof sourceConfig !== 'object') return {}
+        for (const key in sourceConfig) {
           if (key === 'visible' || key === 'visibleTo' || key === 'stylesheet') continue
           this.$set(evalConfig, key, this.evaluateExpression(key, sourceConfig[key]))
         }
@@ -131,6 +131,7 @@ export default {
           return expr.evaluate(this.exprAst[key], {
             items: ctx.store,
             props: this.props,
+            config: ctx.component.config,
             vars: ctx.vars,
             loop: ctx.loop,
             Math: Math,