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

Merge pull request #4994 from jonataswalker/array-alpha-color

Browse Source 
Add alpha default value to ol.Color array form
This commit is contained in:
Frédéric Junod
2016-03-08 17:04:19 +01:00
parent b5dc619e0e 2564bb3e58
commit 6c74e90c5d
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/ol/color/color.js
View File

@@ -17,7 +17,8 @@ goog.require('ol.math');
/** /**
* A color represented as a short array [red, green, blue, alpha]. * A color represented as a short array [red, green, blue, alpha].
* red, green, and blue should be integers in the range 0..255 inclusive. * red, green, and blue should be integers in the range 0..255 inclusive.
* alpha should be a float in the range 0..1 inclusive. * alpha should be a float in the range 0..1 inclusive. If no alpha value is
* given then `1` will be used.
* @typedef {Array.<number>} * @typedef {Array.<number>}
* @api * @api
*/ */
@@ -293,7 +294,7 @@ ol.color.toString = function(color) {
if (b != (b | 0)) { if (b != (b | 0)) {
b = (b + 0.5) | 0; b = (b + 0.5) | 0;
} }
var a = color[3]; var a = color[3] === undefined ? 1 : color[3];
return 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')'; return 'rgba(' + r + ',' + g + ',' + b + ',' + a + ')';
}; };

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

@@ -129,6 +129,10 @@ describe('ol.color', function() {
expect(ol.color.toString([1.2, 2.5, 3.7, 0.4])).to.be('rgba(1,3,4,0.4)'); expect(ol.color.toString([1.2, 2.5, 3.7, 0.4])).to.be('rgba(1,3,4,0.4)');
}); });
it('sets default alpha value if undefined', function() {
expect(ol.color.toString([0, 0, 0])).to.be('rgba(0,0,0,1)');
});
}); });
}); });