ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1985 from fredj/named-color

Browse Source 
Handle ol.color.ENABLE_NAMED_COLORS = false
This commit is contained in:
Frédéric Junod
2014-04-16 16:28:26 +02:00
parent b5873ff866 251996f789
commit cb1edd262d
2 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ol/render/canvas/canvas.js
View File

@@ -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];
/**

24
test/spec/ol/color.test.js
View File

@@ -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)'];