Skip to content

Commit 798d51f

Browse files
RockinRoelRockinRoel
committed
WT-10966: Added dprint and reformatted all JavaScript
1 parent 923c03f commit 798d51f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+15817
-14111
lines changed

‎.dprint.json‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"lineWidth": 120,
3+
"indentWidth": 2,
4+
"useTabs": false,
5+
"typescript": {
6+
"quoteStyle": "preferDouble",
7+
"semiColons": "always",
8+
"useBraces": "always",
9+
"bracePosition": "sameLine",
10+
"singleBodyPosition": "nextLine",
11+
"arrowFunction.useParentheses": "force",
12+
"operatorPosition": "sameLine",
13+
"trailingCommas": "onlyMultiLine",
14+
"arguments.trailingCommas": "never",
15+
"parameters.trailingCommas": "never"
16+
},
17+
"includes": ["src/js/*.{js}", "src/web/skeleton/*.{js}"],
18+
"excludes": [
19+
"**/node_modules",
20+
"*.min.js",
21+
"jquery.js"
22+
],
23+
"plugins": [
24+
"https://plugins.dprint.dev/typescript-0.74.0.wasm"
25+
]
26+
}

‎src/js/AuthModel.js‎

Lines changed: 38 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -6,44 +6,41 @@
66

77
/* Note: this is at the same time valid JavaScript and C++. */
88

9-
WT_DECLARE_WT_MEMBER
10-
(1, JavaScriptConstructor, "AuthThrottle",
11-
function(WT, button, text) {
12-
button.wtThrottle = this;
13-
14-
var timer = null, originalText = null, counter = 0;
15-
16-
function restore() {
17-
clearInterval(timer);
18-
timer = null;
19-
20-
WT.setHtml(button, originalText);
21-
button.disabled = false;
22-
originalText = null;
23-
}
24-
25-
function update() {
26-
if (counter == 0) {
27-
restore();
28-
} else {
29-
WT.setHtml(button, text.replace("{1}", counter));
30-
--counter;
31-
}
32-
}
33-
34-
this.reset = function(timeout) {
35-
if (timer) {
36-
restore();
37-
}
38-
39-
originalText = button.innerHTML;
40-
41-
counter = timeout;
42-
if (counter) {
43-
timer = setInterval(update, 1000);
44-
button.disabled = true;
45-
update();
46-
}
47-
};
48-
}
49-
);
9+
WT_DECLARE_WT_MEMBER(1, JavaScriptConstructor, "AuthThrottle", function(WT, button, text) {
10+
button.wtThrottle = this;
11+
12+
var timer = null, originalText = null, counter = 0;
13+
14+
function restore() {
15+
clearInterval(timer);
16+
timer = null;
17+
18+
WT.setHtml(button, originalText);
19+
button.disabled = false;
20+
originalText = null;
21+
}
22+
23+
function update() {
24+
if (counter == 0) {
25+
restore();
26+
} else {
27+
WT.setHtml(button, text.replace("{1}", counter));
28+
--counter;
29+
}
30+
}
31+
32+
this.reset = function(timeout) {
33+
if (timer) {
34+
restore();
35+
}
36+
37+
originalText = button.innerHTML;
38+
39+
counter = timeout;
40+
if (counter) {
41+
timer = setInterval(update, 1000);
42+
button.disabled = true;
43+
update();
44+
}
45+
};
46+
});

‎src/js/Bootstrap5Theme.js‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@
66

77
/* Note: this is at the same time valid JavaScript and C++. */
88

9-
WT_DECLARE_WT_MEMBER
10-
(3, JavaScriptObject, "theme", {
9+
WT_DECLARE_WT_MEMBER(3, JavaScriptObject, "theme", {
1110
classes: {
12-
valid: 'is-valid',
13-
invalid: 'is-invalid'
11+
valid: "is-valid",
12+
invalid: "is-invalid",
1413
},
15-
type: 'bootstrap',
16-
version: 5
14+
type: "bootstrap",
15+
version: 5,
1716
});

‎src/js/BootstrapValidate.js‎

Lines changed: 86 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,87 +6,89 @@
66

77
/* Note: this is at the same time valid JavaScript and C++. */
88

9-
WT_DECLARE_WT_MEMBER
10-
(1, JavaScriptFunction, "validate",
11-
function(edit) {
12-
var v;
13-
if (edit.options) {
14-
if (edit.options.item(edit.selectedIndex) == null)
15-
v = "";
16-
else
17-
v = edit.options.item(edit.selectedIndex).text;
18-
} else if (typeof edit.wtLObj === 'object' &&
19-
typeof edit.wtLObj.getValue === 'function') {
20-
v = edit.wtLObj.getValue();
21-
} else
22-
v = edit.value;
23-
24-
v = edit.wtValidate.validate(v);
25-
26-
this.setValidationState(edit, v.valid, v.message, 1);
27-
});
28-
29-
WT_DECLARE_WT_MEMBER
30-
(2, JavaScriptFunction, "setValidationState",
31-
function(edit, state, message, styles) {
32-
33-
/* const */ var ValidationInvalidStyle = 0x1;
34-
/* const */ var ValidationValidStyle = 0x2;
35-
36-
var validStyle = (state == 1) &&
37-
((styles & ValidationValidStyle) != 0);
38-
var invalidStyle = (state != 1) &&
39-
((styles & ValidationInvalidStyle) != 0);
40-
41-
var $edit = $(edit);
42-
43-
var validClass = 'Wt-valid';
44-
var invalidClass = 'Wt-invalid';
45-
var theme = this.theme;
46-
if (typeof theme === 'object') {
47-
validClass = theme.classes.valid;
48-
invalidClass = theme.classes.invalid;
49-
}
50-
$edit
51-
.toggleClass(validClass, validStyle)
52-
.toggleClass(invalidClass, invalidStyle);
53-
54-
var controlGroup;
55-
var success;
56-
var error;
57-
58-
controlGroup = $edit.closest(".control-group");
59-
60-
if (controlGroup.length > 0) { // bootstrapVersion === 2
61-
success = "success";
62-
error = "error";
63-
} else {
64-
controlGroup = $edit.closest(".form-group");
65-
if (controlGroup.length > 0) { // bootstrapVersion === 3
66-
success = "has-success";
67-
error = "has-error";
68-
}
69-
}
70-
71-
if (controlGroup.length > 0) {
72-
var validationMsg = controlGroup.find(".Wt-validation-message");
73-
if (validationMsg) {
74-
if (state)
75-
validationMsg.text(edit.defaultTT);
76-
else
77-
validationMsg.text(message);
78-
}
79-
80-
controlGroup
81-
.toggleClass(success, validStyle)
82-
.toggleClass(error, invalidStyle);
83-
}
84-
85-
if (typeof edit.defaultTT === 'undefined')
86-
edit.defaultTT = edit.getAttribute('title') || '';
87-
88-
if (state)
89-
edit.setAttribute('title', edit.defaultTT);
90-
else
91-
edit.setAttribute('title', message);
92-
});
9+
WT_DECLARE_WT_MEMBER(1, JavaScriptFunction, "validate", function(edit) {
10+
var v;
11+
if (edit.options) {
12+
if (edit.options.item(edit.selectedIndex) == null) {
13+
v = "";
14+
} else {
15+
v = edit.options.item(edit.selectedIndex).text;
16+
}
17+
} else if (
18+
typeof edit.wtLObj === "object" &&
19+
typeof edit.wtLObj.getValue === "function"
20+
) {
21+
v = edit.wtLObj.getValue();
22+
} else {
23+
v = edit.value;
24+
}
25+
26+
v = edit.wtValidate.validate(v);
27+
28+
this.setValidationState(edit, v.valid, v.message, 1);
29+
});
30+
31+
WT_DECLARE_WT_MEMBER(2, JavaScriptFunction, "setValidationState", function(edit, state, message, styles) {
32+
/* const */ var ValidationInvalidStyle = 0x1;
33+
/* const */ var ValidationValidStyle = 0x2;
34+
35+
var validStyle = (state == 1) &&
36+
((styles & ValidationValidStyle) != 0);
37+
var invalidStyle = (state != 1) &&
38+
((styles & ValidationInvalidStyle) != 0);
39+
40+
var $edit = $(edit);
41+
42+
var validClass = "Wt-valid";
43+
var invalidClass = "Wt-invalid";
44+
var theme = this.theme;
45+
if (typeof theme === "object") {
46+
validClass = theme.classes.valid;
47+
invalidClass = theme.classes.invalid;
48+
}
49+
$edit
50+
.toggleClass(validClass, validStyle)
51+
.toggleClass(invalidClass, invalidStyle);
52+
53+
var controlGroup;
54+
var success;
55+
var error;
56+
57+
controlGroup = $edit.closest(".control-group");
58+
59+
if (controlGroup.length > 0) { // bootstrapVersion === 2
60+
success = "success";
61+
error = "error";
62+
} else {
63+
controlGroup = $edit.closest(".form-group");
64+
if (controlGroup.length > 0) { // bootstrapVersion === 3
65+
success = "has-success";
66+
error = "has-error";
67+
}
68+
}
69+
70+
if (controlGroup.length > 0) {
71+
var validationMsg = controlGroup.find(".Wt-validation-message");
72+
if (validationMsg) {
73+
if (state) {
74+
validationMsg.text(edit.defaultTT);
75+
} else {
76+
validationMsg.text(message);
77+
}
78+
}
79+
80+
controlGroup
81+
.toggleClass(success, validStyle)
82+
.toggleClass(error, invalidStyle);
83+
}
84+
85+
if (typeof edit.defaultTT === "undefined") {
86+
edit.defaultTT = edit.getAttribute("title") || "";
87+
}
88+
89+
if (state) {
90+
edit.setAttribute("title", edit.defaultTT);
91+
} else {
92+
edit.setAttribute("title", message);
93+
}
94+
});

0 commit comments

Comments
 (0)