modular-scale
Advanced tools
Comparing version 4.4.0 to 4.4.1
16
index.js
@@ -1,3 +0,5 @@ | ||
var msBases = [1]; | ||
var msRatios = [(1+ Math.sqrt(5))/2]; | ||
var defaultBase = 1; | ||
var defaultRatio = ((1+ Math.sqrt(5)) * 0.5); | ||
var msBases = [defaultBase]; | ||
var msRatios = [defaultRatio]; | ||
var ratioNames = { | ||
@@ -37,5 +39,5 @@ minorSecond : 1.067, | ||
if (typeof base === 'string') { | ||
base = parseFloat(base, 10) || 1; | ||
base = parseFloat(base, 10); | ||
} | ||
return base; | ||
return base || defaultBase; | ||
}); | ||
@@ -45,5 +47,7 @@ | ||
if (typeof ratio === 'string') { | ||
ratio = ratioNames[ratio] || parseFloat(ratio, 10) || 0; | ||
ratio = ratioNames[ratio]? ratioNames[ratio]: | ||
parseFloat(ratio, 10); | ||
} | ||
return ratio; | ||
return ratio || defaultRatio; | ||
}); | ||
@@ -50,0 +54,0 @@ |
{ | ||
"name": "modular-scale", | ||
"version": "4.4.0", | ||
"version": "4.4.1", | ||
"description": "Module for generating a modular scale.", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -71,6 +71,6 @@ var mocha = require('mocha'), | ||
it('should not bomb wehn pased completely wrong values', function() { | ||
it('should not bomb when pased completely wrong values', function() { | ||
ms = modularScale({ | ||
ratios: 'octopus', | ||
bases: {} | ||
ratios: [0], | ||
bases: 'fuuuu' | ||
}); | ||
@@ -77,0 +77,0 @@ |
8528
192