Merge branch 'sugarlabs:master' into master

sugarlabs · Jan 11, 2025 · ee68e41 · ee68e41
2 parents 72f3beb + 7cb169b
commit ee68e41
Show file tree

Hide file tree

Showing 5 changed files with 3,809 additions and 4,483 deletions.
diff --git a/js/artwork.js b/js/artwork.js
diff --git a/js/logo.js b/js/logo.js
@@ -1792,6 +1792,14 @@ class Logo {
                     }
                 }
                 document.getElementById("stop").style.color = "white";
+                const saveButton = docById('saveButton');
+                const saveButtonAdvanced = docById('saveButtonAdvanced');
+                const recordButton = docById("record");
+                saveButton.disabled = false;
+                saveButtonAdvanced.disabled = false;
+                saveButton.className = "";
+                saveButtonAdvanced.className = "";
+                recordButton.className = "";
             }
         }
     }

diff --git a/js/toolbar.js b/js/toolbar.js
@@ -355,7 +355,7 @@ class Toolbar {
     renderPlayIcon(onclick) {
         const playIcon = docById("play");
         const stopIcon = docById("stop");
-
+        const recordButton = docById("record");
         let isPlayIconRunning = false;
 
         function handleClick() {
@@ -378,6 +378,11 @@ class Toolbar {
             onclick(this.activity);
             handleClick();
             stopIcon.style.color = this.stopIconColorWhenPlaying;
+            saveButton.disabled = true;
+            saveButtonAdvanced.disabled = true;
+           saveButton.className = "grey-text inactiveLink";
+           saveButtonAdvanced.className = "grey-text inactiveLink";
+           recordButton.className = "grey-text inactiveLink";
             isPlayIconRunning = true;
             play_button_debounce_timeout = setTimeout(function() { handleClick(); }, 2000);
 
@@ -399,9 +404,15 @@ class Toolbar {
      */
     renderStopIcon(onclick) {
         const stopIcon = docById("stop");
+        const recordButton = docById("record");
         stopIcon.onclick = () => {
             onclick(this.activity);
             stopIcon.style.color = "white";
+            saveButton.disabled = false;
+            saveButtonAdvanced.disabled = false;
+            saveButton.className = "";
+            saveButtonAdvanced.className = "";
+            recordButton.className = "";
         };
     }