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

Merge pull request #2073 from fredj/named-colors

Browse Source 
Change ol.ENABLE_NAMED_COLORS to be false by default
This commit is contained in:
Frédéric Junod
2014-05-15 11:02:34 +02:00
parent 9874f502ab b42f4e1b0c
commit 92a7f9112c
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/ol.js
+2 -2
View File
@@ -86,9 +86,9 @@ ol.ENABLE_IMAGE = true;
/** /**
* @define {boolean} Enable named colors. Enabling named colors adds about 3KB * @define {boolean} Enable named colors. Enabling named colors adds about 3KB
* uncompressed / 1.5KB compressed to the final build size. Default is * uncompressed / 1.5KB compressed to the final build size. Default is
* `true`. * `false`.
*/ */
ol.ENABLE_NAMED_COLORS = true; ol.ENABLE_NAMED_COLORS = false;
/** /**
test/spec/ol/color.test.js
+2 -2
View File
@@ -13,7 +13,7 @@ describe('ol.color', function() {
ol.color.fromStringInternal_.restore(); ol.color.fromStringInternal_.restore();
}); });
if (ol.color.ENABLE_NAMED_COLORS) { if (ol.ENABLE_NAMED_COLORS) {
it('can parse named colors', function() { it('can parse named colors', function() {
expect(ol.color.fromString('red')).to.eql([255, 0, 0, 1]); expect(ol.color.fromString('red')).to.eql([255, 0, 0, 1]);
}); });
@@ -36,7 +36,7 @@ describe('ol.color', function() {
[255, 255, 0, 0.1]); [255, 255, 0, 0.1]);
}); });
if (ol.color.ENABLE_NAMED_COLORS) { if (ol.ENABLE_NAMED_COLORS) {
it('caches parsed values', function() { it('caches parsed values', function() {
var count = ol.color.fromStringInternal_.callCount; var count = ol.color.fromStringInternal_.callCount;
ol.color.fromString('aquamarine'); ol.color.fromString('aquamarine');