kStepNumber should contain numbers instead of strings

saebekassebil · Jun 17, 2013 · 0611b0c · 0611b0c
1 parent a37a136
commit 0611b0c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 15 deletions.
diff --git a/src/chord.js b/src/chord.js
@@ -393,7 +393,7 @@ TeoriaChord.prototype = {
 
       interval = kStepNumber[interval];
       for (i = 0, length = intervals.length; i < length; i++) {
-        if (intervals[i].interval === +interval) {
+        if (intervals[i].interval === interval) {
           return teoria.interval.from(this.root, intervals[i]);
         }
       }

diff --git a/src/core.js b/src/core.js
@@ -219,17 +219,17 @@
   };
 
   var kStepNumber = {
-    'first': '1',
-    'tonic': '1',
-    'second': '2',
-    'third': '3',
-    'fourth': '4',
-    'fifth': '5',
-    'sixth': '6',
-    'seventh': '7',
-    'ninth': '9',
-    'eleventh': '11',
-    'thirteenth': '13'
+    'first': 1,
+    'tonic': 1,
+    'second': 2,
+    'third': 3,
+    'fourth': 4,
+    'fifth': 5,
+    'sixth': 6,
+    'seventh': 7,
+    'ninth': 9,
+    'eleventh': 11,
+    'thirteenth': 13
   };
 
   // Adjusted Shearer syllables - Chromatic solfege system

diff --git a/src/scale.js b/src/scale.js
@@ -52,9 +52,7 @@ TeoriaScale.prototype = {
   },
 
   get: function(i) {
-    if (typeof i === 'string' && i in kStepNumber) {
-      i = parseInt(kStepNumber[i], 10);
-    }
+    i = (typeof i === 'string' && i in kStepNumber) ? kStepNumber[i] : i;
 
     return this.notes[i - 1];
   },