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

Use indexOf instead of RegExp as suggested

Browse Source
This commit is contained in:
Marc Jansen
2016-11-29 10:55:04 +01:00
parent 02d41caa8a
commit 88cfdb435c
1 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/color.js
+2 -20
View File
@@ -13,24 +13,6 @@ goog.require('ol.math');
ol.color.HEX_COLOR_RE_ = /^#(?:[0-9a-f]{3}){1,2}$/i; ol.color.HEX_COLOR_RE_ = /^#(?:[0-9a-f]{3}){1,2}$/i;
/**
* Regular expression for matching RGB style strings.
* @const
* @type {RegExp}
* @private
*/
ol.color.RGB_COLOR_RE_ = /^rgb\(/i;
/**
* Regular expression for matching RGBA style strings.
* @const
* @type {RegExp}
* @private
*/
ol.color.RGBA_COLOR_RE_ = /^rgba\(/;
/** /**
* Regular expression for matching potential named color style strings. * Regular expression for matching potential named color style strings.
* @const * @const
@@ -168,10 +150,10 @@ ol.color.fromStringInternal_ = function(s) {
} }
a = 1; a = 1;
color = [r, g, b, a]; color = [r, g, b, a];
} else if (ol.color.RGBA_COLOR_RE_.test(s)) { // rgba() } else if (s.indexOf('rgba(') == 0) { // rgba()
parts = s.slice(5, -1).split(',').map(Number); parts = s.slice(5, -1).split(',').map(Number);
color = ol.color.normalize(parts); color = ol.color.normalize(parts);
} else if (ol.color.RGB_COLOR_RE_.test(s)) { // rgb() } else if (s.indexOf('rgb(') == 0) { // rgb()
parts = s.slice(4, -1).split(',').map(Number); parts = s.slice(4, -1).split(',').map(Number);
parts.push(1); parts.push(1);
color = ol.color.normalize(parts); color = ol.color.normalize(parts);