dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop/3.5.2' of github.com:thingsboard/thingsboard into develop/3.5.2

Browse Source
This commit is contained in:
Andrii Shvaika 2023-08-17 12:22:47 +03:00
commit 58f54bade7
2 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -78,7 +78,7 @@
<zookeeper.version>3.8.1</zookeeper.version> <zookeeper.version>3.8.1</zookeeper.version>
<protobuf.version>3.21.9</protobuf.version> <protobuf.version>3.21.9</protobuf.version>
<grpc.version>1.42.1</grpc.version> <grpc.version>1.42.1</grpc.version>
<tbel.version>1.0.7</tbel.version> <tbel.version>1.0.8</tbel.version>
<lombok.version>1.18.18</lombok.version> <lombok.version>1.18.18</lombok.version>
<paho.client.version>1.2.4</paho.client.version> <paho.client.version>1.2.4</paho.client.version>
<paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version> <paho.mqttv5.client.version>1.2.5</paho.mqttv5.client.version>

28
ui-ngx/src/app/shared/models/ace/tbel/worker-tbel.js
View File

@ -4656,10 +4656,12 @@ var JSHINT = (function() {
case "else": case "else":
case "finally": case "finally":
case "for": case "for":
case "foreach":
case "if": case "if":
case "in": case "in":
case "instanceof": case "instanceof":
case "return": case "return":
case "until":
case "switch": case "switch":
case "throw": case "throw":
case "try": case "try":
@ -5387,6 +5389,7 @@ var JSHINT = (function() {
} }
switch (state.funct["(verb)"]) { switch (state.funct["(verb)"]) {
case "break": case "break":
case "until":
case "continue": case "continue":
case "return": case "return":
case "throw": case "throw":
@ -7691,6 +7694,20 @@ var JSHINT = (function() {
return this; return this;
}).labelled = true; }).labelled = true;
blockstmt("until", function(context) {
var t = state.tokens.next;
state.funct["(breakage)"] += 1;
state.funct["(loopage)"] += 1;
increaseComplexityCount();
advance("(");
checkCondAssignment(expression(context, 0));
advance(")", t);
block(context, true, true);
state.funct["(breakage)"] -= 1;
state.funct["(loopage)"] -= 1;
return this;
}).labelled = true;
blockstmt("with", function(context) { blockstmt("with", function(context) {
var t = state.tokens.next; var t = state.tokens.next;
if (state.isStrict()) { if (state.isStrict()) {
@ -7840,7 +7857,12 @@ var JSHINT = (function() {
increaseComplexityCount(); increaseComplexityCount();
this.first = block(context, true, true); this.first = block(context, true, true);
var s = state.tokens.next;
if (s.value !== "while") {
advance("until");
} else {
advance("while"); advance("while");
}
var t = state.tokens.next; var t = state.tokens.next;
advance("("); advance("(");
checkCondAssignment(expression(context, 0)); checkCondAssignment(expression(context, 0));
@ -8135,7 +8157,7 @@ var JSHINT = (function() {
state.funct["(breakage)"] += 1; state.funct["(breakage)"] += 1;
state.funct["(loopage)"] += 1; state.funct["(loopage)"] += 1;
state.funct["(breakage)"] -= 1; // state.funct["(breakage)"] -= 1;
state.funct["(loopage)"] -= 1; state.funct["(loopage)"] -= 1;
} else { } else {
nolinebreak(state.tokens.curr); nolinebreak(state.tokens.curr);
@ -9755,9 +9777,9 @@ Lexer.prototype = {
scanKeyword: function() { scanKeyword: function() {
var result = /^[a-zA-Z_$][a-zA-Z0-9_$]*/.exec(this.input); var result = /^[a-zA-Z_$][a-zA-Z0-9_$]*/.exec(this.input);
var keywords = [ var keywords = [
"if", "in", "do", "var", "for", "new", "if", "in", "do", "var", "for", "foreach", "new",
"try", "let", "this", "else", "case", "try", "let", "this", "else", "case",
"void", "with", "enum", "while", "break", "void", "with", "enum", "while", "until", "break",
"catch", "throw", "const", "yield", "class", "catch", "throw", "const", "yield", "class",
"super", "return", "typeof", "delete", "super", "return", "typeof", "delete",
"switch", "export", "import", "default", "switch", "export", "import", "default",