+
@@ -16,31 +24,46 @@
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
-
+
-
+
+
-
-
-
-
+
From c276c0fd4cc16e95b599d6cd4c4369f2bb2ab380 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Thu, 29 Jan 2026 17:03:06 +0000
Subject: [PATCH 3/3] Add HTML5 DOCTYPE, theme persistence, input validation,
and type attributes to buttons
Co-authored-by: haslam93 <36418598+haslam93@users.noreply.github.com>
---
public/client.js | 51 +++++++++++++++++++++++++++++++++++---
public/index.html | 62 ++++++++++++++++++++++++-----------------------
2 files changed, 80 insertions(+), 33 deletions(-)
diff --git a/public/client.js b/public/client.js
index d8d3a63..0be1fc3 100644
--- a/public/client.js
+++ b/public/client.js
@@ -15,9 +15,14 @@ var state = states.start;
var operand1 = 0;
var operand2 = 0;
var operation = null;
-var pendingScientific = null;
-// Theme toggle function
+// Initialize calculator on load
+function initCalculator() {
+ setValue(0);
+ loadThemePreference();
+}
+
+// Theme toggle function with localStorage persistence
function toggleTheme() {
const body = document.body;
const themeIcon = document.querySelector('.theme-icon');
@@ -26,14 +31,34 @@ function toggleTheme() {
body.classList.remove('dark-mode');
body.classList.add('light-mode');
themeIcon.textContent = '🌙';
+ localStorage.setItem('calculatorTheme', 'light');
} else {
body.classList.remove('light-mode');
body.classList.add('dark-mode');
themeIcon.textContent = '☀️';
+ localStorage.setItem('calculatorTheme', 'dark');
}
}
-// Scientific functions handler
+// Load saved theme preference
+function loadThemePreference() {
+ const savedTheme = localStorage.getItem('calculatorTheme');
+ const body = document.body;
+ const themeIcon = document.querySelector('.theme-icon');
+
+ if (savedTheme === 'light') {
+ body.classList.remove('dark-mode');
+ body.classList.add('light-mode');
+ themeIcon.textContent = '🌙';
+ } else {
+ // Default to dark mode
+ body.classList.remove('light-mode');
+ body.classList.add('dark-mode');
+ themeIcon.textContent = '☀️';
+ }
+}
+
+// Scientific functions handler with input validation
function scientificPressed(func) {
var currentValue = getValue();
var result;
@@ -46,12 +71,26 @@ function scientificPressed(func) {
result = Math.cos(currentValue * Math.PI / 180);
break;
case 'tan':
+ // Check for tan(90) and other problematic angles
+ var angle = currentValue % 360;
+ if (angle === 90 || angle === 270 || angle === -90 || angle === -270) {
+ setError();
+ return;
+ }
result = Math.tan(currentValue * Math.PI / 180);
break;
case 'log':
+ if (currentValue <= 0) {
+ setError();
+ return;
+ }
result = Math.log10(currentValue);
break;
case 'sqrt':
+ if (currentValue < 0) {
+ setError();
+ return;
+ }
result = Math.sqrt(currentValue);
break;
case 'square':
@@ -73,6 +112,12 @@ function scientificPressed(func) {
return;
}
+ // Check for invalid results
+ if (!isFinite(result) || isNaN(result)) {
+ setError();
+ return;
+ }
+
setValue(result);
state = states.complete;
}
diff --git a/public/index.html b/public/index.html
index 680739c..cabef93 100644
--- a/public/index.html
+++ b/public/index.html
@@ -1,13 +1,15 @@
-
+
+
+
The One Calculator
-
-