Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(client/cordova/apple/macos): force rendering of add server button #1973

Merged
merged 2 commits into from
Apr 15, 2024
Merged

fix(client/cordova/apple/macos): force rendering of add server button #1973

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d2b84ab
fix(client/cordova/macos): force rendering of add server button
daniellacosse Apr 15, 2024
7b74854
Merge branch 'master' into daniellacosse/macos-rendering-fix
daniellacosse Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions client/src/www/ui_components/add-server-view.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ Polymer({
color: var(--error-color);
--paper-input-container-input-color: var(--error-color);
}
#add-server-button {
#addServerButton {
background-color: var(--dark-green);
color: #fff;
padding: 0 20px;
Expand Down Expand Up @@ -200,7 +200,7 @@ Polymer({
</div>
<div class="button-container">
<paper-button class="faded" on-tap="_ignoreDetectedServer">[[localize('server-add-ignore')]]</paper-button>
<paper-button id="add-server-button" on-tap="_addDetectedServer">[[localize('server-add')]]</paper-button>
<paper-button id="addServerButton" on-tap="_addDetectedServer">[[localize('server-add')]]</paper-button>
</div>
</div>
</paper-dialog>
Expand Down Expand Up @@ -278,6 +278,9 @@ Polymer({
if (accessKeyInput.validate()) {
this.fire('AddServerConfirmationRequested', {accessKey: this.accessKey});
}

// On MacOS, the button doesn't render until focused. This is likely due to the fact that we're still using a deprecated web view
this.$.addServerButton.focus();
},

_addDetectedServer: function() {
Expand Down
Loading