Skip to content

Commit

Permalink
Merge pull request FlowFuse#1085 from FlowFuse/v1.13.0
Browse files Browse the repository at this point in the history
v1.13.0
  • Loading branch information
joepavitt authored Jul 11, 2024
2 parents e7ce895 + 3754946 commit aca4576
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions nodes/widgets/ui_chart.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@

<script type="text/javascript">
(function () {
function hexToRgb(hex) {
function hexToRgb (hex) {
const result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex)
return result
? {
Expand Down Expand Up @@ -178,7 +178,7 @@
{ value: 'y-L-d', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.yLd'), hasValue: false },
{ value: 'd/L', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.dL'), hasValue: false },
{ value: 'ccc HH:mm', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.cccHHmm'), hasValue: false },
{ value: 'custom', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.custom'), icon: "fa fa-font" },
{ value: 'custom', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.custom'), icon: 'fa fa-font' },
{ value: 'auto', label: RED._('@flowfuse/node-red-dashboard/ui-chart:ui-chart.label.auto'), hasValue: false }
]
})
Expand Down
2 changes: 1 addition & 1 deletion nodes/widgets/ui_text_input.html
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
topic: { value: 'topic', validate: (hasProperty(RED.validators, 'typedInput') ? RED.validators.typedInput('topicType') : function (v) { return true }) },
topicType: { value: 'msg' },
mode: { value: 'text', required: true },
tooltip: { value: ''},
tooltip: { value: '' },
delay: {
value: 300,
validate: function (v) {
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flowfuse/node-red-dashboard",
"version": "1.12.4",
"version": "1.13.0",
"description": "Dashboard 2.0 - A collection of Node-RED nodes that provide functionality to build your own UI applications (inc. forms, buttons, charts).",
"keywords": [
"node-red"
Expand Down
2 changes: 1 addition & 1 deletion ui/src/widgets/ui-text-input/UITextInput.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<template>
<v-tooltip :text="tooltip" :disabled="!tooltip?.length" location="bottom">
<!-- eslint-disable-next-line vue/no-template-shadow -->
<template v-slot:activator="{ props }">
<template #activator="{ props }">
<v-text-field
v-if="type !== 'textarea'" v-model="value"
v-bind="props"
Expand Down

0 comments on commit aca4576

Please sign in to comment.