Skip to content

Commit 3215b9f

Browse files
committed
let form have no buttons
bump libs as 3.6.2
1 parent 1d68901 commit 3215b9f

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

.jshintrc

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
2-
//"undef": true, // require all non-globals to be declared
32
"asi": true, // allow missing semicolons
43
"curly": true, // require braces
54
"eqnull": true, // ignore ==null
5+
//"eqeqeq": true, // enforce ===
6+
"freeze": true, // don't allow override
7+
"indent": 4, // default indent of 4
68
"forin": true, // require property filtering in "for in" loops
79
"immed": true, // require immediate functions to be wrapped in ( )
810
"nonbsp": true, // warn on unexpected whitespace breaking chars
911
//"strict": true, // commented out for now as it causes 100s of warnings, but want to get there eventually
1012
//"unused": true, // Check for unused functions and variables
1113
"loopfunc": true, // allow functions to be defined in loops
1214
//"expr": true, // allow ternery operator syntax...
15+
"shadow": true, // allow variable shadowing (re-use of names...)
1316
"sub": true, // don't warn that foo['bar'] should be written as foo.bar
14-
"proto": true, // allow setting of __proto__ in node < v0.12
15-
"esversion": 6 // allow es6
17+
"proto": true, // allow setting of __proto__ in node < v0.12,
18+
"esversion": 11 // allow es11(ES2020)
1619
}

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: Thu Oct 19 2023 11:28:56 GMT+0100 (British Summer Time)
2+
# Time: Wed Dec 06 2023 11:08:36 GMT+0000 (Greenwich Mean Time)
33

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

29-
# hash: 418014d7a1fbfe2efcab3913f619a292b9b2f9059280671ec0b58fc302afa420
29+
# hash: e9dccfa90ec237dfcc3ff33a82c03d3c3811a6cae1ff1c55e60a701aa087f880

dist/js/app.min.js

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

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "node-red-dashboard",
3-
"version": "3.6.1",
3+
"version": "3.6.2",
44
"description": "A set of dashboard nodes for Node-RED",
55
"keywords": [
66
"node-red"
@@ -131,11 +131,11 @@
131131
"map-stream": "^0.0.7",
132132
"material-design-icons-iconfont": "^6.7.0",
133133
"moment": "~2.29.4",
134-
"sass": "^1.69.4",
134+
"sass": "^1.69.5",
135135
"sprintf-js": "^1.1.3",
136136
"streamqueue": "~1.1.2",
137137
"svg-morpheus": "^0.3.0",
138-
"terser": "^5.22.0",
138+
"terser": "^5.25.0",
139139
"tinycolor2": "^1.6.0",
140140
"weather-icons-lite": "^1.6.1"
141141
},

src/components/ui-component/templates/form.html

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
<!-- <md-datepicker ng-if="opt.type=='date'" ng-model="me.item.formValue[opt.value]"></md-datepicker> -->
4141
</div>
4242
<div class="form-control" ng-class="{'form-control-single':me.item.cancel == '','form-control-no-label':me.item.label == ''}" style="margin-top:{{( me.item.label =='' ? me.item.rowCount < 3 ? me.item.rowHeight * 0.4 : me.item.rowHeight * 0.2 : me.item.rowHeight * -0.1)}}px;">
43-
<md-button class="md-raised nr-dashboard-form-button" type="submit" style="height:{{(me.item.sy -4)}}px;line-height:{{(me.item.sy -4)}}px">{{me.item.submit}}</md-button>
44-
<md-button ng-if="me.item.cancel != ''" class="md-raised nr-dashboard-form-button" style="height:{{(me.item.sy -4)}}px;line-height:{{(me.item.sy -4)}}px" ng-click="me.reset()">{{me.item.cancel}}</md-button>
43+
<md-button ng-if="me.item.submit != ''" class="md-raised nr-dashboard-form-button" type="submit" style="height:{{(me.item.sy -4)}}px;line-height:{{(me.item.sy -4)}}px">{{me.item.submit}}</md-button>
44+
<md-button ng-if="me.item.cancel != ''" class="md-raised nr-dashboard-form-button" style="height:{{(me.item.sy -4)}}px;line-height:{{(me.item.sy -4)}}px" ng-click="me.reset()">{{me.item.cancel}}</md-button>
4545
</div>
4646
</form>
4747
</md-card>
48-
cancel

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -336,6 +336,7 @@ angular.module('ui').controller('uiComponentController', ['$scope', 'UiEvents',
336336
})
337337
me.item.rowCount = me.item.splitLayout == true ? Math.ceil(me.item.options.length/2) : me.item.options.length;
338338
me.item.rowCount += me.item.label == '' ? 1 : 2
339+
me.item.rowCount += (me.item.submit !== '' || me.item.cancel !== '') ? 0 : -1
339340
me.item.rowCount += me.item.extraRows;
340341
me.item.rowHeight = (((me.item.rowCount -1) * me.item.sy) + (me.item.label == '' ? me.item.sy * 0.3 : 1.2 * me.item.sy) + ((me.item.rowCount - 1) * me.item.cy))/me.item.rowCount;
341342
me.stop = function(event) {

0 commit comments

Comments
 (0)