partial fix to #1281

sugarlabs · Jan 4, 2019 · 4771436 · 4771436
1 parent d1aec5b
commit 4771436
Showing 1 changed file with 58 additions and 0 deletions.
diff --git a/js/utils/musicutils.js b/js/utils/musicutils.js
@@ -2210,6 +2210,64 @@ function getNote(noteArg, octave, transposition, keySignature, movable, directio
                 }
             }
 
+            if (movable) {
+                switch(mode) {
+                case 'dorian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 6;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'phrygian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 5;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'lydian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 4;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'mixolydian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 3;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'minor':
+                case 'aeolian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 2;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'locrian':
+                    var i = SOLFEGENAMES.indexOf(solfegePart);
+                    i += 1;
+                    if (i > 6) {
+                        i -= 7;
+                    }
+                    solfegePart = SOLFEGENAMES[i];
+                    break;
+                case 'major':
+                case 'ionian':
+                default:
+                    break;
+                }
+            }
+
             if (halfSteps.indexOf(solfegePart) !== -1) {
                 var index = halfSteps.indexOf(solfegePart) + offset;
                 if (index > 11) {