Merge branch 'master' into test-with-profiles-2

wearefrank · Dec 3, 2024 · b33cdfb · b33cdfb
2 parents a1526cd + 05b1ae4
commit b33cdfb
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 25 deletions.
diff --git a/package.json b/package.json
@@ -34,7 +34,7 @@
     "@ng-bootstrap/ng-bootstrap": "17.0.1",
     "@popperjs/core": "^2.11.8",
     "@prettier/plugin-xml": "^3.2.2",
-    "ace-builds": "^1.36.4",
+    "ace-builds": "^1.36.5",
     "angular-split": "^17.2.0",
     "bootstrap": "4",
     "bootstrap-icons": "^1.11.3",
@@ -43,7 +43,7 @@
     "diff-match-patch": "1.0.5",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-prettier": "^5.2.1",
-    "eslint-plugin-unicorn": "^55.0.0",
+    "eslint-plugin-unicorn": "^56.0.1",
     "font-awesome": "^4.7.0",
     "monaco-editor": "0.48.0",
     "ng-simple-file-tree": "^0.1.28",

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/shared/services/settings.service.ts b/src/app/shared/services/settings.service.ts
@@ -13,8 +13,7 @@ export class SettingsService {
     this.setShowMultipleAtATime(localStorage.getItem(this.showMultipleAtATimeKey) === 'true');
     const MAX_ALLOWED_DROPDOWN_VALUE: number = 8;
     const tempTableSpacing: number = +(localStorage.getItem(this.tableSpacingKey) ?? 1);
-    const cappedTableSpacing: number =
-      tempTableSpacing < MAX_ALLOWED_DROPDOWN_VALUE ? tempTableSpacing : MAX_ALLOWED_DROPDOWN_VALUE;
+    const cappedTableSpacing: number = Math.min(tempTableSpacing, MAX_ALLOWED_DROPDOWN_VALUE);
     this.setTableSpacing(cappedTableSpacing);
     this.setShowSearchWindowOnLoad(localStorage.getItem(this.showSearchWindowOnLoadKey) === 'true');
     this.setPrettifyOnLoad(localStorage.getItem(this.prettifyOnLoadKey) === 'true');