Skip to content

Commit 49350a8

Browse files
committed
undo text input time change, bump packages, tweak dropdown PR
1 parent b15badc commit 49350a8

File tree

8 files changed

+20
-13
lines changed

8 files changed

+20
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11

2+
### 3.6.0: Milestone Release
3+
4+
- Let dropdown be clearable. PR #816
5+
- Unfix datetime (revert regression)
6+
27
### 3.5.0: Milestone Release
38

49
- Add text styling feature to ui_text. PR #805

dist/dashboard.appcache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CACHE MANIFEST
2-
# Time: Wed May 24 2023 17:11:51 GMT+0100 (British Summer Time)
2+
# Time: Thu Aug 31 2023 21:11:58 GMT+0100 (British Summer Time)
33

44
CACHE:
55
i18n.js
@@ -26,4 +26,4 @@ loading.html
2626
NETWORK:
2727
*
2828

29-
# hash: c2ba978b56b3995cc2674f6d3d9538a08637b0a64d6f3d27a1b1ce0383871bb2
29+
# hash: dd12675f374146045adff1fb001753bbbf10d70a4b2684622cc63ca9b55ca7cf

dist/js/app.min.js

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nodes/locales/en-US/ui_dropdown.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<p>The configured value of the selected item will be returned as <code>msg.payload</code>.</p>
66
<p>Setting <code>msg.payload</code> to one of the item values will preset the choice in the dropdown.
77
If using the multi-select option then the payload should be an array of values.</p>
8-
<p>Optionally user search term can deleted if set the <code>msg.resetSearch</code> property is present and true.</p>
8+
<p>Optionally the user search term can deleted if the <code>msg.resetSearch</code> property is present and set to <i>true</i>.</p>
99
<p>Optionally the <b>Topic</b> field can be used to set the <code>msg.topic</code> property.</p>
1010
<p>The Options may be configured by inputting <code>msg.options</code> containing an array.
1111
If just text then the value will be the same as the label, otherwise you can specify both by

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-red-dashboard",
3-
"version": "3.5.0",
3+
"version": "3.6.0",
44
"description": "A set of dashboard nodes for Node-RED",
55
"keywords": [
66
"node-red"
@@ -88,7 +88,7 @@
8888
"compression": "^1.7.4",
8989
"gridstack": "^0.6.4",
9090
"serve-static": "^1.15.0",
91-
"socket.io": "^4.5.4"
91+
"socket.io": "^4.7.2"
9292
},
9393
"devDependencies": {
9494
"angular": "~1.8.3",
@@ -124,18 +124,18 @@
124124
"gulp-replace": "^1.1.4",
125125
"gulp-sass": "^5.1.0",
126126
"gulp-util": "^3.0.8",
127-
"jquery": "~3.6.4",
127+
"jquery": "~3.7.1",
128128
"jshint": "~2.13.6",
129129
"justgage": "~1.6.1",
130130
"less": "^3.13.1",
131131
"map-stream": "^0.0.7",
132132
"material-design-icons-iconfont": "^6.7.0",
133133
"moment": "~2.29.4",
134-
"sass": "^1.62.1",
134+
"sass": "^1.66.1",
135135
"sprintf-js": "^1.1.2",
136136
"streamqueue": "~1.1.2",
137137
"svg-morpheus": "^0.3.0",
138-
"terser": "^5.17.1",
138+
"terser": "^5.19.3",
139139
"tinycolor2": "^1.6.0",
140140
"weather-icons-lite": "^1.6.1"
141141
},

src/components/ui-component/templates/text-input-CR.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</md-tooltip>
2020
<input
2121
ng-model="me.item.value"
22+
ng-model-options="{'timezone':'GMT'}"
2223
ng-keydown="me.keyPressed($event)"
2324
ng-blur="me.item.sendOnBlur ? me.keyPressed($event) : false"
2425
ng-trim="false"

src/components/ui-component/templates/text-input.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
</md-tooltip>
2020
<input
2121
ng-model="me.item.value"
22+
ng-model-options="{'timezone':'GMT'}"
2223
ng-change="me.valueChanged({{me.item.delay}})"
2324
ng-trim="false"
2425
ng-disabled="me.item.disabled"

src/components/ui-component/ui-component-ctrl.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ angular.module('ui').controller('uiComponentController', ['$scope', 'UiEvents',
438438
// If resetSearch is present, clear user searchTerm input
439439
if (msg && msg.resetSearch) {
440440
me.searchTerm = "";
441-
}
441+
}
442442
// options should have the correct format see beforeEmit in ui-dropdown.js
443443
if (msg && msg.isOptionsValid) {
444444
me.item.options = msg.newOptions;

0 commit comments

Comments
 (0)