Skip to content

Commit

Permalink
more feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
daniellacosse committed Apr 4, 2024
1 parent 904fd72 commit 44d4fdd
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 10 deletions.
3 changes: 1 addition & 2 deletions client/src/cordova/android/import_messages.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ function escapeXmlCharacters(str) {
.replace(/'/g, "\\'")
.replace(/</g, '\\<')
.replace(/>/g, '\\>;')
.replace(/&/g, '\\&')
.replace(/\//g, "\\\\");
.replace(/&/g, '\\&');
}

function getNativeLocale(locale) {
Expand Down
4 changes: 2 additions & 2 deletions client/src/www/app/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ export class Settings {
private readonly settings = new Map<string, string>();

constructor(
private storage: Storage = window.localStorage,
private validKeys: string[] = Object.values(SettingsKey)
private storage: Storage = window.localStorage,
private validKeys: string[] = Object.values(SettingsKey)
) {
this.loadSettings();
}
Expand Down
10 changes: 5 additions & 5 deletions client/src/www/ui_components/add-server-view.js
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ Polymer({
this.$.addServerSheet.open();
},

openAddServerConfirmationSheet: function (accessKey) {
openAddServerConfirmationSheet: function(accessKey) {
this.$.addServerSheet.close();
this.accessKey = accessKey;
this.$.serverDetectedSheet.open();
Expand Down Expand Up @@ -291,7 +291,7 @@ Polymer({
},

// Event listeners
_openChanged: function (event) {
_openChanged: function(event) {
var dialog = event.target;
if (dialog.opened) {
// Scroll the page to the bottom to prevent the dialog from moving when the keyboard
Expand All @@ -306,7 +306,7 @@ Polymer({
}
},

_inputFocusChanged: function (event) {
_inputFocusChanged: function(event) {
var input = event.target;
if (input.focused) {
this.$.accessKeyInput.label = '';
Expand All @@ -316,7 +316,7 @@ Polymer({
input.toggleClass('input-focus', input.focused);
},

_inputInvalidChanged: function (event) {
_inputInvalidChanged: function(event) {
var input = event.target;
input.toggleClass('input-invalid', input.invalid);
if (input.invalid) {
Expand All @@ -326,7 +326,7 @@ Polymer({
}
},

_disallowScroll: function (event) {
_disallowScroll: function(event) {
event.preventDefault();
},

Expand Down
2 changes: 1 addition & 1 deletion client/src/www/ui_components/app-root.js
Original file line number Diff line number Diff line change
Expand Up @@ -805,7 +805,7 @@ export class AppRoot extends mixinBehaviors([AppLocalizeBehavior], PolymerElemen

_computeLanguage(availableLanguages, defaultLanguage) {
const overrideLanguage = window.localStorage.getItem('overrideLanguage');
const bestMatchingLanguage = OutlineI18n.getBestMatchingLanguage(Object.keys(availableLanguages));
const bestMatchingLanguage = getBestMatchingLanguage(Object.keys(availableLanguages));
return overrideLanguage || bestMatchingLanguage || defaultLanguage;
}

Expand Down

0 comments on commit 44d4fdd

Please sign in to comment.