Skip to content

Commit

Permalink
Merge branch 'pr/1529' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Feb 15, 2024
2 parents 9a7b19f + d1577f7 commit 5cb6b44
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 21 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Added pause functionality to Blockrain activity #1501
- Fraction Bounce Activity, trick to cheat the score #1511
- Tooltips not localized in Reflection activity #1508
- Time fluctuations in Clock Activity #1507

## [1.7.0] - 2023-03-28
### Added
Expand Down
29 changes: 8 additions & 21 deletions activities/Clock.activity/js/activity.js
Original file line number Diff line number Diff line change
Expand Up @@ -303,30 +303,17 @@ define(["sugar-web/activity/activity","sugar-web/env","sugar-web/graphics/radiob


Clock.prototype.changeWriteTime = function (writeTime) {
this.writeTime = writeTime;
this.writeTime = writeTime;

if (writeTime) {
this.textTimeElem.style.display = "block";
} else {
this.textTimeElem.style.display = "none";
}

if (this.setTime) {
this.writeTimeInSetTime();
}
else {
this.updateSizes();

var date = new Date();
var hours = date.getHours();
var minutes = date.getMinutes();
var seconds = date.getSeconds();
this.displayTime(hours, minutes, seconds);
if (writeTime) {
this.textTimeElem.style.display = "block";
} else {
this.textTimeElem.style.display = "none";
}

this.drawBackground();
}
this.writeTimeInSetTime();

}
}

Clock.prototype.changeWriteDate = function (writeDate) {
this.writeDate = writeDate;
Expand Down

0 comments on commit 5cb6b44

Please sign in to comment.