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

Color / add an isStringColor utility function

Browse Source
This commit is contained in:
Olivier Guyot
2019-10-22 16:03:34 +02:00
parent a0b271a812
commit 56faf4c3ad
2 changed files with 26 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/ol/color.js
View File

@@ -223,3 +223,14 @@ export function toString(color) {
const a = color[3] === undefined ? 1 : color[3]; const a = color[3] === undefined ? 1 : color[3];
return 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; return 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')';
} }
/**
* @param {string} s String.
* @return {boolean} Whether the string is actually a valid color
*/
export function isStringColor(s) {
if (NAMED_COLOR_RE_.test(s)) {
s = fromNamed(s);
}
return HEX_COLOR_RE_.test(s) || s.indexOf('rgba(') === 0 || s.indexOf('rgb(') === 0;
}

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

@@ -2,6 +2,7 @@ import {
asArray, asArray,
asString, asString,
fromString, fromString,
isStringColor,
normalize, normalize,
toString toString
} from '../../../src/ol/color.js'; } from '../../../src/ol/color.js';
@@ -159,4 +160,18 @@ describe('ol.color', function() {
}); });
}); });
describe('isValid()', function() {
it('correctly detects valid colors', function() {
expect(isStringColor('rgba(1,3,4,0.4)')).to.be(true);
expect(isStringColor('rgb(1,3,4)')).to.be(true);
expect(isStringColor('lightgreen')).to.be(true);
expect(isStringColor('yellow')).to.be(true);
expect(isStringColor('GREEN')).to.be(true);
expect(isStringColor('notacolor')).to.be(false);
expect(isStringColor('red_')).to.be(false);
});
});
}); });