From 2c45ac9df3a2423fa204b85df50d51bf06ff87af Mon Sep 17 00:00:00 2001 From: Karl Burtram Date: Mon, 10 Sep 2018 21:17:57 -0700 Subject: [PATCH] Reorder Connection Name field in Connection Dialog (#2498) --- .../connection/connectionDialog/connectionWidget.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/sql/parts/connection/connectionDialog/connectionWidget.ts b/src/sql/parts/connection/connectionDialog/connectionWidget.ts index 815b93253f..ee0a14dfd7 100644 --- a/src/sql/parts/connection/connectionDialog/connectionWidget.ts +++ b/src/sql/parts/connection/connectionDialog/connectionWidget.ts @@ -156,11 +156,6 @@ export class ConnectionWidget { } private fillInConnectionForm(): void { - // Connection name - let connectionNameOption = this._optionsMaps[ConnectionOptionSpecialType.connectionName]; - let connectionNameBuilder = DialogHelper.appendRow(this._tableContainer, connectionNameOption.displayName, 'connection-label', 'connection-input'); - this._connectionNameInputBox = new InputBox(connectionNameBuilder.getHTMLElement(), this._contextViewService, { ariaLabel: connectionNameOption.displayName }); - // Server name let serverNameOption = this._optionsMaps[ConnectionOptionSpecialType.serverName]; let serverNameBuilder = DialogHelper.appendRow(this._tableContainer, serverNameOption.displayName, 'connection-label', 'connection-input'); @@ -222,6 +217,11 @@ export class ConnectionWidget { let serverGroupBuilder = DialogHelper.appendRow(this._tableContainer, this._serverGroupDisplayString, 'connection-label', 'connection-input'); DialogHelper.appendInputSelectBox(serverGroupBuilder, this._serverGroupSelectBox); + // Connection name + let connectionNameOption = this._optionsMaps[ConnectionOptionSpecialType.connectionName]; + let connectionNameBuilder = DialogHelper.appendRow(this._tableContainer, connectionNameOption.displayName, 'connection-label', 'connection-input'); + this._connectionNameInputBox = new InputBox(connectionNameBuilder.getHTMLElement(), this._contextViewService, { ariaLabel: connectionNameOption.displayName }); + let AdvancedLabel = localize('advanced', 'Advanced...'); this._advancedButton = this.createAdvancedButton(this._tableContainer, AdvancedLabel); } @@ -398,7 +398,7 @@ export class ConnectionWidget { public focusOnOpen(): void { this._handleClipboard(); - this._connectionNameInputBox.focus(); + this._serverNameInputBox.focus(); this.focusPasswordIfNeeded(); this.clearValidationMessages(); }