Merge pull request #4 from kijowski/fromHex-fix

fromHex fix
williamngan · Nov 3, 2017 · baba0f2 · baba0f2
2 parents 9b1e531 + 33d7165
commit baba0f2
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 2 deletions.
diff --git a/dist/files/Color.js b/dist/files/Color.js
diff --git a/src/Color.ts b/src/Color.ts
@@ -64,7 +64,7 @@ export class Color extends Pt {
 
     if (hex[0] == "#") hex = hex.substr(1); // remove '#' if needed
     if (hex.length <= 3) {
-      let fn = (i) => hex[1]||"F";
+      let fn = (i) => hex[i]||"F";
       hex = `${fn(0)}${fn(0)}${fn(1)}${fn(1)}${fn(2)}${fn(2)}`;
     }
 

diff --git a/src/test/Color.spec.ts b/src/test/Color.spec.ts
@@ -0,0 +1,39 @@
+import chai = require('chai');
+import mocha = require('mocha');
+import {Pt, Group} from '../Pt';
+import {Geom, Num} from '../Num';
+import {Color} from '../Color';
+
+var {assert} = chai;
+var {describe, it} = mocha;
+
+describe('Color: ', function() {
+
+  describe('fromHex: ', function() {
+    it('works with explicit hash in input string', function() {
+      const actual = Color.fromHex("#FFFF00");
+      const expected = [255, 255, 0];
+      assert.isTrue( actual.equals(expected));
+      // assert.equal( [actual.r,actual.g, actual.b], expected );
+    });
+
+    it('works without explicit hash in input string', function() {
+      const actual = Color.fromHex("FFFF00");
+      const expected = [255, 255, 0];
+      assert.isTrue( actual.equals(expected));
+    });
+
+    it('works with all character cases', function() {
+      const actual = Color.fromHex("FffF00");
+      const expected = [255, 255, 0];
+      assert.isTrue( actual.equals(expected));
+    });
+
+    it('works with short form', function() {
+      const actual = Color.fromHex("FF0");
+      const expected = [255, 255, 0];
+      assert.isTrue( actual.equals(expected));
+    });
+  });
+
+});