From 1da879ef06852f1cb221d2ead2bb60ee37d41335 Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 15 Apr 2014 16:57:49 +0200 Subject: [PATCH 1/2] Don't use a named color for defaultFillStyle Named color support is optional (see ol.color.ENABLE_NAMED_COLORS) --- src/ol/render/canvas/canvas.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ol/render/canvas/canvas.js b/src/ol/render/canvas/canvas.js index 0fec04de99..21e546d579 100644 --- a/src/ol/render/canvas/canvas.js +++ b/src/ol/render/canvas/canvas.js @@ -1,7 +1,5 @@ goog.provide('ol.render.canvas'); -goog.require('ol.color'); - /** * @typedef {{fillStyle: string}} @@ -39,7 +37,7 @@ ol.render.canvas.defaultFont = '10px sans-serif'; * @const * @type {ol.Color} */ -ol.render.canvas.defaultFillStyle = ol.color.fromString('black'); +ol.render.canvas.defaultFillStyle = [0, 0, 0, 1]; /** From 251996f78981e60dcf98976c7fc417d8b3e09d0d Mon Sep 17 00:00:00 2001 From: Frederic Junod Date: Tue, 15 Apr 2014 17:22:58 +0200 Subject: [PATCH 2/2] Use ol.color.ENABLE_NAMED_COLORS in tests --- test/spec/ol/color.test.js | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/test/spec/ol/color.test.js b/test/spec/ol/color.test.js index e773a15a48..f14ea58bb7 100644 --- a/test/spec/ol/color.test.js +++ b/test/spec/ol/color.test.js @@ -13,9 +13,11 @@ describe('ol.color', function() { ol.color.fromStringInternal_.restore(); }); - it('can parse named colors', function() { - expect(ol.color.fromString('red')).to.eql([255, 0, 0, 1]); - }); + if (ol.color.ENABLE_NAMED_COLORS) { + it('can parse named colors', function() { + expect(ol.color.fromString('red')).to.eql([255, 0, 0, 1]); + }); + } it('can parse 3-digit hex colors', function() { expect(ol.color.fromString('#087')).to.eql([0, 136, 119, 1]); @@ -34,13 +36,15 @@ describe('ol.color', function() { [255, 255, 0, 0.1]); }); - it('caches parsed values', function() { - var count = ol.color.fromStringInternal_.callCount; - ol.color.fromString('aquamarine'); - expect(ol.color.fromStringInternal_.callCount).to.be(count + 1); - ol.color.fromString('aquamarine'); - expect(ol.color.fromStringInternal_.callCount).to.be(count + 1); - }); + if (ol.color.ENABLE_NAMED_COLORS) { + it('caches parsed values', function() { + var count = ol.color.fromStringInternal_.callCount; + ol.color.fromString('aquamarine'); + expect(ol.color.fromStringInternal_.callCount).to.be(count + 1); + ol.color.fromString('aquamarine'); + expect(ol.color.fromStringInternal_.callCount).to.be(count + 1); + }); + } it('throws an error on invalid colors', function() { var invalidColors = ['tuesday', '#1234567', 'rgb(255.0,0,0)'];