diff options
author | Ulrich-Matthias Schäfer <ulima.ums@googlemail.com> | 2018-11-04 21:46:33 +0100 |
---|---|---|
committer | Ulrich-Matthias Schäfer <ulima.ums@googlemail.com> | 2018-11-04 21:46:33 +0100 |
commit | d654ab010adf42aab757529b6c09f27215740b27 (patch) | |
tree | 95baa420a8eb71f64220b27b822bcab403d4d535 /src/Morphable.js | |
parent | d22dce113a4a61d76b3c0e7c7fb77231f575c6fd (diff) | |
download | svg.js-d654ab010adf42aab757529b6c09f27215740b27.tar.gz svg.js-d654ab010adf42aab757529b6c09f27215740b27.zip |
Revert back to classes, fix remaining tests
Diffstat (limited to 'src/Morphable.js')
-rw-r--r-- | src/Morphable.js | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/Morphable.js b/src/Morphable.js index d927733..18f5a3b 100644 --- a/src/Morphable.js +++ b/src/Morphable.js @@ -7,6 +7,7 @@ import PointArray from './PointArray.js' import PathArray from './PathArray.js' import Box from './Box.js' import Matrix from './Matrix.js' +import {delimiter, pathLetters, numberAndUnit} from './regex.js' export default class Morphable { constructor (stepper) { @@ -58,12 +59,12 @@ export default class Morphable { } else if (type === 'string') { if (Color.isColor(value)) { this.type(Color) - } else if (regex.delimiter.test(value)) { - this.type(regex.pathLetters.test(value) + } else if (delimiter.test(value)) { + this.type(pathLetters.test(value) ? PathArray : SVGArray ) - } else if (regex.numberAndUnit.test(value)) { + } else if (numberAndUnit.test(value)) { this.type(SVGNumber) } else { this.type(NonMorphable) |