Skip to content

Commit a52a0d8

Browse files
author
Lionel Laské
committed
Merge branch 'pr/1966' into dev
2 parents 435982b + f31382f commit a52a0d8

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
3232
- Delete key deleted wrong character in Calculator #1935
3333
- Fototoon don't handle window resize #559
3434
- Bug in Flip Activity when resize an ended game #1956
35+
- Inconsistent degree trigonometric evaluation in Calculate activity #1964
3536

3637
## [1.9.0] - 2025-03-25
3738
### Added

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ var CalculateApp = {
316316
var parenthesisRegex = new RegExp("\\(([^\\)]+)\\)", "gi");
317317
var arrayToReplace = parenthesisRegex.exec(results[j]);
318318
if (arrayToReplace && arrayToReplace.length >= 2) {
319-
equation = equation.replace(arrayToReplace[1], arrayToReplace[1] + " * " + CalculateApp.data.pi + " / 180");
319+
equation = equation.replace(arrayToReplace[1], "(" + arrayToReplace[1] + ") * " + CalculateApp.data.pi + " / 180");
320320
}
321321
}
322322
resultIndex = equation.substr(resultIndex + 1).search(regex);

0 commit comments

Comments
 (0)