Skip to content

Commit

Permalink
undo text input time change, bump packages, tweak dropdown PR
Browse files Browse the repository at this point in the history
  • Loading branch information
dceejay committed Aug 31, 2023
1 parent b15badc commit 49350a8
Show file tree
Hide file tree
Showing 8 changed files with 20 additions and 13 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@

### 3.6.0: Milestone Release

- Let dropdown be clearable. PR #816
- Unfix datetime (revert regression)

### 3.5.0: Milestone Release

- Add text styling feature to ui_text. PR #805
Expand Down
4 changes: 2 additions & 2 deletions dist/dashboard.appcache
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CACHE MANIFEST
# Time: Wed May 24 2023 17:11:51 GMT+0100 (British Summer Time)
# Time: Thu Aug 31 2023 21:11:58 GMT+0100 (British Summer Time)

CACHE:
i18n.js
Expand All @@ -26,4 +26,4 @@ loading.html
NETWORK:
*

# hash: c2ba978b56b3995cc2674f6d3d9538a08637b0a64d6f3d27a1b1ce0383871bb2
# hash: dd12675f374146045adff1fb001753bbbf10d70a4b2684622cc63ca9b55ca7cf
8 changes: 4 additions & 4 deletions dist/js/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion nodes/locales/en-US/ui_dropdown.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p>The configured value of the selected item will be returned as <code>msg.payload</code>.</p>
<p>Setting <code>msg.payload</code> to one of the item values will preset the choice in the dropdown.
If using the multi-select option then the payload should be an array of values.</p>
<p>Optionally user search term can deleted if set the <code>msg.resetSearch</code> property is present and true.</p>
<p>Optionally the user search term can deleted if the <code>msg.resetSearch</code> property is present and set to <i>true</i>.</p>
<p>Optionally the <b>Topic</b> field can be used to set the <code>msg.topic</code> property.</p>
<p>The Options may be configured by inputting <code>msg.options</code> containing an array.
If just text then the value will be the same as the label, otherwise you can specify both by
Expand Down
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "node-red-dashboard",
"version": "3.5.0",
"version": "3.6.0",
"description": "A set of dashboard nodes for Node-RED",
"keywords": [
"node-red"
Expand Down Expand Up @@ -88,7 +88,7 @@
"compression": "^1.7.4",
"gridstack": "^0.6.4",
"serve-static": "^1.15.0",
"socket.io": "^4.5.4"
"socket.io": "^4.7.2"
},
"devDependencies": {
"angular": "~1.8.3",
Expand Down Expand Up @@ -124,18 +124,18 @@
"gulp-replace": "^1.1.4",
"gulp-sass": "^5.1.0",
"gulp-util": "^3.0.8",
"jquery": "~3.6.4",
"jquery": "~3.7.1",
"jshint": "~2.13.6",
"justgage": "~1.6.1",
"less": "^3.13.1",
"map-stream": "^0.0.7",
"material-design-icons-iconfont": "^6.7.0",
"moment": "~2.29.4",
"sass": "^1.62.1",
"sass": "^1.66.1",
"sprintf-js": "^1.1.2",
"streamqueue": "~1.1.2",
"svg-morpheus": "^0.3.0",
"terser": "^5.17.1",
"terser": "^5.19.3",
"tinycolor2": "^1.6.0",
"weather-icons-lite": "^1.6.1"
},
Expand Down
1 change: 1 addition & 0 deletions src/components/ui-component/templates/text-input-CR.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</md-tooltip>
<input
ng-model="me.item.value"
ng-model-options="{'timezone':'GMT'}"
ng-keydown="me.keyPressed($event)"
ng-blur="me.item.sendOnBlur ? me.keyPressed($event) : false"
ng-trim="false"
Expand Down
1 change: 1 addition & 0 deletions src/components/ui-component/templates/text-input.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
</md-tooltip>
<input
ng-model="me.item.value"
ng-model-options="{'timezone':'GMT'}"
ng-change="me.valueChanged({{me.item.delay}})"
ng-trim="false"
ng-disabled="me.item.disabled"
Expand Down
2 changes: 1 addition & 1 deletion src/components/ui-component/ui-component-ctrl.js
Original file line number Diff line number Diff line change
Expand Up @@ -438,7 +438,7 @@ angular.module('ui').controller('uiComponentController', ['$scope', 'UiEvents',
// If resetSearch is present, clear user searchTerm input
if (msg && msg.resetSearch) {
me.searchTerm = "";
}
}
// options should have the correct format see beforeEmit in ui-dropdown.js
if (msg && msg.isOptionsValid) {
me.item.options = msg.newOptions;
Expand Down

0 comments on commit 49350a8

Please sign in to comment.