Merge branch 'pr/1610' into dev

llaske · Apr 24, 2024 · 73d7640 · 73d7640
2 parents 075de81 + 83a3d9a
commit 73d7640
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Gear unexpected behavior of Play toolbar icon #1600
 - Add a zoom-in and zoom-out button in ColorMyWorld activity #1593
 - Adding Drag to fill Cells Functionality in Game of Life #1150
+- Undismissable palletes in Dollar street #1605
 
 ## [1.8.0] - 2024-04-10
 ### Added

diff --git a/activities/DollarStreet.activity/js/palettes/incomes.js b/activities/DollarStreet.activity/js/palettes/incomes.js
@@ -34,6 +34,10 @@ define(['sugar-web/graphics/palette',"text!activity/palettes/incomes.html"], fun
 			that.getPalette().dispatchEvent(that.incomeEvent);
 		});
 
+		document.querySelector('#content').addEventListener('click', function(event){
+			that.popDown();
+		});	
+
 		let wrapper = this.getPalette().childNodes[1];
 		wrapper.style.width = "450px";
 		wrapper.style.maxWidth = "400px";

diff --git a/activities/DollarStreet.activity/js/palettes/regions.js b/activities/DollarStreet.activity/js/palettes/regions.js
@@ -61,6 +61,10 @@ define(["sugar-web/graphics/palette"], function(palette) {
 		that.getPalette().firstChild.style.backgroundColor = "transparent";
 		that.getPalette().firstChild.style.backgroundImage = "";
 
+		document.querySelector('#content').addEventListener('click', function(event){
+			that.popDown();
+		});	
+
 		function popDownOnButtonClick(event) {
 			console.log(event);
 			that.popDown();

diff --git a/activities/DollarStreet.activity/js/palettes/things.js b/activities/DollarStreet.activity/js/palettes/things.js
@@ -55,6 +55,10 @@ define(["sugar-web/graphics/palette"], function(palette) {
 		that.getPalette().firstChild.style.backgroundColor = "transparent";
 		that.getPalette().firstChild.style.backgroundImage = "";
 
+		document.querySelector('#content').addEventListener('click', function(event){
+			that.popDown();
+		});	
+
 		function popDownOnButtonClick(event) {
 			console.log(event);
 			that.popDown();