Merge branch 'pr/1948' into dev

Author: Lionel Laské

CHANGELOG.md

@@ -28,6 +28,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Variable Shadowing - Overwrites Module Object #1846
 - Use of '=' instead of '==' in if else statement in Physics game activity.js #1870
 - Camera remains active when toggling off in QRCode activity (Web/Desktop) #1911
+- Delete key deleted wrong character in Calculator #1935
 
 ## [1.9.0] - 2025-03-25
 ### Added

activities/Calculate.activity/js/calculate-activity.js

@@ -49,20 +49,16 @@ function doGetCaretPosition(oField) {
 //We will remove one character from the calc input
 //If on desktop, we remove a character from the carret position
 function removeCharacter() {
+  var caretPosition = doGetCaretPosition(CalculateApp.elements.calcInput);
+  var currentValue = CalculateApp.elements.calcInput.value;
+  
   if (CalculateApp.data.isMobile) {
-    CalculateApp.elements.calcInput.value = CalculateApp.elements.calcInput.value.substring(0, CalculateApp.elements.calcInput.value.length - 1);
+    CalculateApp.elements.calcInput.value = currentValue.substring(0, currentValue.length - 1);
   } else {
-    var caretPosition = doGetCaretPosition(CalculateApp.elements.calcInput);
-    if (caretPosition === CalculateApp.elements.calcInput.value.length) {
-      caretPosition = caretPosition - 1;
-    }
-    if (caretPosition < 0) {
-      caretPosition = 0;
+    if(caretPosition > 0) {
+      CalculateApp.elements.calcInput.value = currentValue.slice(0,caretPosition - 1) +currentValue.slice(caretPosition);
+      CalculateApp.elements.calcInput.setSelectionRange(caretPosition- 1,caretPosition- 1);
     }
-    var currentValue = CalculateApp.elements.calcInput.value;
-
-    CalculateApp.elements.calcInput.value = currentValue.slice(0, caretPosition) + currentValue.slice(caretPosition + 1);
-    CalculateApp.elements.calcInput.setSelectionRange(caretPosition, caretPosition);
   }
   CalculateApp.focus();
 }