sugarlabs
diff --git a/‎css/activities.css‎
Lines changed: 3 additions & 0 deletions b/‎css/activities.css‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎js/abc.js‎
Lines changed: 19 additions & 6 deletions b/‎js/abc.js‎
Lines changed: 19 additions & 6 deletions
diff --git a/‎js/activity.js‎
Lines changed: 9 additions & 9 deletions b/‎js/activity.js‎
Lines changed: 9 additions & 9 deletions
diff --git a/‎js/block.js‎
Lines changed: 18 additions & 23 deletions b/‎js/block.js‎
Lines changed: 18 additions & 23 deletions
diff --git a/‎js/collaboration/.DS_Store‎
6 KB b/‎js/collaboration/.DS_Store‎
6 KB
@@ -61,6 +61,7 @@
   transition: width 0.4s ease-in-out;
   font-size: 24px;
   color: black;
+  max-width: 100%;
 }
 
 #search:focus {
@@ -75,6 +76,8 @@
   position: relative;
   background-color: rgba(255, 255, 255, 1);
   max-width: 396px;
+  max-height: 200px;
+  overflow-y: auto;
   font-size: 18px;
   border: 2px solid #87cefa;
   list-style-type: none;
 
@@ -86,7 +86,7 @@ const processABCNotes = function(logo, turtle) {
 
         for (const [key, value] of Object.entries(replacements)) {
             if (note.includes(key)) {
-                note = note.replace(new RegExp(key, 'g'), value);
+                note = note.replace(new RegExp(key, "g"), value);
                 if (key.length === 1) break;
             }
         }
@@ -153,15 +153,28 @@ const processABCNotes = function(logo, turtle) {
                     i += 2;
                     break;
                 case "pickup":
-                    // FIXME: how does one define pickup in ABC notation?
-                    i += 1;
+                    {
+                        // Handle pickup measure
+                        const pickupDuration = logo.notation.notationStaging[turtle][i + 1];
+                        logo.notationNotes[turtle] += `K: pickup=${pickupDuration}\n`;
+                        i += 1;
+                    } // <- made a seperate block for this since js doesnt allow declaration of variables using let or const directly inside a case block
                     break;
                 case "voice one":
+                    logo.notationNotes[turtle] += "V:1\n";
+                    break;
                 case "voice two":
+                    logo.notationNotes[turtle] += "V:2\n";
+                    break;
                 case "voice three":
+                    logo.notationNotes[turtle] += "V:3\n";
+                    break;
                 case "voice four":
+                    logo.notationNotes[turtle] += "V:4\n";
+                    break;
                 case "one voice":
-                    // FIXME: how does one define multi-voice in ABC notation?
+                    // Return to a single voice
+                    logo.notationNotes[turtle] += "V:1\n";
                     break;
                 default:
                     logo.notationNotes[turtle] += obj;
@@ -223,7 +236,7 @@ const processABCNotes = function(logo, turtle) {
                 }
             }
 
-           /**
+            /**
             * Processes an incomplete tuplet and appends the corresponding ABC notation to the notation string.
             * @param {object} logo - The logo object containing notation information.
             * @param {string} turtle - The identifier for the turtle.
@@ -424,4 +437,4 @@ const saveAbcOutput = function(activity) {
 
     activity.logo.notationOutput += "\n";
     return activity.logo.notationOutput;
-};
+};
@@ -2427,27 +2427,27 @@ class Activity {
                     that.doSearch();
                     if (event.keyCode === 13) this.searchWidget.style.visibility = "visible";
                 },
-                focus: (event, ui) => {
+                focus: (event) => {
                     event.preventDefault();
-                    that.searchWidget.value = ui.item.label;
                 }
             });
 
-            $j("#search").autocomplete("widget").addClass("scrollSearch");
-
             $j("#search").autocomplete("instance")._renderItem = (ul, item) => {
                 return $j("<li></li>")
                     .data("item.autocomplete", item)
                     .append(
                         '<img src="' +
                             item.artwork +
-                            '" height = "20px">' +
-                            "<a>" +
-                            " " +
+                            '" height="20px">' +
+                            "<a> " +
                             item.label +
                             "</a>"
                     )
-                    .appendTo(ul.css("z-index", 9999));
+                    .appendTo(ul.css({
+                        "z-index": 9999,
+                        "max-height": "200px",
+                        "overflow-y": "auto"
+                    }));
             };
             const searchInput = this.searchWidget.idInput_custom;
             if (!searchInput || searchInput.length <= 0) return;
@@ -6166,7 +6166,7 @@ class Activity {
 
             document.addEventListener("mousemove", (event) => {
                 this.hasMouseMoved = true;
-                event.preventDefault();
+                // event.preventDefault();
                 // this.selectedBlocks = [];
                 if (this.isDragging){
                     this.currentX = event.clientX;
 
@@ -22,9 +22,8 @@
    DISABLEDFILLCOLOR, DISABLEDSTROKECOLOR, docById, DOUBLEFLAT,
    DOUBLESHARP, DRUMNAMES, EASTINDIANSOLFNOTES, EFFECTSNAMES,
    EXPANDBUTTON, FILTERTYPES, FLAT, getDrumName, getDrumSynthName,
-   getModeNumbers, getNoiseName, getNoiseSynthName, getTemperament,
-   getTemperamentKeys, getTemperamentsList, getTextWidth,
-   getVoiceSynthName, hideDOMLabel, HIGHLIGHTSTROKECOLORS,
+   getModeNumbers, getNoiseName, getTemperament, getTemperamentKeys,
+   getTemperamentsList, getTextWidth, hideDOMLabel, HIGHLIGHTSTROKECOLORS,
    i18nSolfege, INVERTMODES, isCustomTemperament, last, MEDIASAFEAREA,
    NATURAL, NOISENAMES, NSYMBOLS, NUMBERBLOCKDEFAULT, OSCTYPES,
    PALETTEFILLCOLORS, PALETTEHIGHLIGHTCOLORS, PALETTESTROKECOLORS,
@@ -966,8 +965,7 @@ class Block {
 
         if (this.image.search("xmlns") !== -1) {
             image.src =
-                "data:image/svg+xml;base64," +
-                window.btoa(base64Encode(this.image));
+                "data:image/svg+xml;base64," + window.btoa(window.base64Encode(this.image));
         } else {
             image.src = this.image;
         }
@@ -1518,8 +1516,7 @@ class Block {
             };
 
             image.src =
-                "data:image/svg+xml;base64," +
-                window.btoa(base64Encode(COLLAPSEBUTTON));
+                "data:image/svg+xml;base64," + window.btoa(base64Encode(COLLAPSEBUTTON));
         };
 
         /**
@@ -1551,8 +1548,7 @@ class Block {
             };
 
             image.src =
-                "data:image/svg+xml;base64," +
-                window.btoa(base64Encode(EXPANDBUTTON));
+                "data:image/svg+xml;base64," + window.btoa(base64Encode(EXPANDBUTTON));
         };
 
         /**
@@ -2942,9 +2938,9 @@ class Block {
             if (
                 that?.name === "vspace" &&
                 that.blocks.blockList[that.connections[1]]?.name === "rest2"
-              ) {
+            ) {
                 return;
-              }
+            }
 
             // Do not allow a stack of blocks to be dragged if the stack contains a silence block.
             let block = that.blocks.blockList[that.connections[1]];
@@ -3382,21 +3378,20 @@ class Block {
 
         const labelElem = docById("labelDiv");
 
-        var safetext = function(text){
+        const safetext = (text) => {
             // Best to avoid using these special characters in text strings
             // without first converting them to their "safe" form.
-            var table = {
-                '<': 'lt',
-                '>': 'gt',
-                '"': 'quot',
-                '\'': 'apos',
-                '&': 'amp',
-                '\r': '#10',
-                '\n': '#13'
+            const table = {
+                "<": "lt",
+                ">": "gt",
+                '"': "quot",
+                "'": "apos",
+                "&": "amp",
+                "\r": "#10",
+                "\n": "#13"
             };
-        
-            return text.toString().replace(/[<>"'\r\n&]/g, function(chr){
-                return '&' + table[chr] + ';';
+            return text.toString().replace(/[<>"'\r\n&]/g, (chr) => {
+                return "&" + table[chr] + ";";
             });
         };