@@ -56,12 +56,13 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
56
56
"input.setting-input-value" ,
57
57
) ! ;
58
58
59
- < < < << << HEAD
60
59
async function submitFormHandler ( ) : Promise < void > {
61
60
$saveServerButton . textContent = "Connecting..." ;
62
61
let serverConf ;
63
62
try {
64
- serverConf = await DomainUtil . checkDomain ( $newServerUrl . value . trim ( ) ) ;
63
+ serverConf = await DomainUtil . checkDomain (
64
+ await autoComplete ( $newServerUrl . value . trim ( ) ) ,
65
+ ) ;
65
66
} catch ( error : unknown ) {
66
67
$saveServerButton . textContent = "Connect" ;
67
68
await dialog . showMessageBox ( {
@@ -74,20 +75,21 @@ export function initNewServerForm({$root, onChange}: NewServerFormProps): void {
74
75
} ) ;
75
76
return ;
76
77
}
78
+
77
79
await DomainUtil . addDomain ( serverConf ) ;
78
80
onChange ( ) ;
79
81
}
80
82
81
- autoComplete ( url : string ) : string {
82
- const pattern = / ^ [ a - z A - Z \d - ] * $ / ;
83
- let serverUrl = url . trim ( ) ;
83
+ async function autoComplete ( url : string ) : Promise < string > {
84
+ const pattern = / ^ [ a - z A - Z \d - ] * $ / ;
85
+ let serverUrl = url . trim ( ) ;
84
86
85
- if ( pattern . test ( serverUrl ) ) {
86
- serverUrl = ' https://' + serverUrl + ' .zulipchat.com' ;
87
- }
87
+ if ( pattern . test ( serverUrl ) ) {
88
+ serverUrl = " https://" + serverUrl + " .zulipchat.com" ;
89
+ }
88
90
89
- return serverUrl ;
90
- }
91
+ return serverUrl ;
92
+ }
91
93
92
94
$saveServerButton . addEventListener ( "click" , async ( ) => {
93
95
await submitFormHandler ( ) ;
0 commit comments