Skip to content

Commit

Permalink
Merge branch 'pr/1558' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Lionel Laské committed Mar 14, 2024
2 parents 2b4a943 + bf8d253 commit e86e98f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
- Time fluctuations in Clock Activity #1507
- Resizing textarea in activity palette looks ugly #1303
- Player without face and color #1536
- Undeletable text in FotoToon #1549

## [1.7.0] - 2023-03-28
### Added
Expand Down
2 changes: 1 addition & 1 deletion activities/Fototoon.activity/js/toon.js
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,6 @@ define(["easel","sugar-web/datastore","sugar-web/env","l10n","humane"], function
}, false);;

var editor = this._textpalette.editorElem;

var colorButtons = this._textpalette.colorButtons;
for (var i = 0; i < colorButtons.length; i++) {
colorButtons[i].addEventListener('click', function(e) {
Expand Down Expand Up @@ -1511,6 +1510,7 @@ define(["easel","sugar-web/datastore","sugar-web/env","l10n","humane"], function
this._stage.removeChild(this._removeButton);
this._textViewer.remove();
this._stage.update();
box.selectGlobe(null);
};
};

Expand Down

0 comments on commit e86e98f

Please sign in to comment.