Allow named colors to be disabled
This commit is contained in:
@@ -13,6 +13,14 @@ goog.require('goog.math');
|
|||||||
goog.require('goog.vec.Mat4');
|
goog.require('goog.vec.Mat4');
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @define {boolean} Enable named colors.
|
||||||
|
* Enabling named colors adds about 3KB uncompressed / 1.5KB compressed to the
|
||||||
|
* final build size.
|
||||||
|
*/
|
||||||
|
ol.color.ENABLE_NAMED_COLORS = true;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
@@ -153,7 +161,7 @@ ol.color.fromString = (function() {
|
|||||||
ol.color.fromStringInternal_ = function(s) {
|
ol.color.fromStringInternal_ = function(s) {
|
||||||
|
|
||||||
var isHex = false;
|
var isHex = false;
|
||||||
if (goog.color.names.hasOwnProperty(s)) {
|
if (ol.color.ENABLE_NAMED_COLORS && goog.color.names.hasOwnProperty(s)) {
|
||||||
s = goog.color.names[s];
|
s = goog.color.names[s];
|
||||||
isHex = true;
|
isHex = true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ ol.render.DragBox = function(opt_style) {
|
|||||||
},
|
},
|
||||||
image: null,
|
image: null,
|
||||||
stroke: {
|
stroke: {
|
||||||
color: 'red',
|
color: '#ff0000',
|
||||||
width: 1
|
width: 1
|
||||||
},
|
},
|
||||||
zIndex: 0
|
zIndex: 0
|
||||||
|
|||||||
@@ -124,7 +124,7 @@ ol.style.DEFAULT_IMAGE_STYLE = {
|
|||||||
* @type {ol.style.Stroke}
|
* @type {ol.style.Stroke}
|
||||||
*/
|
*/
|
||||||
ol.style.DEFAULT_STROKE_STYLE = {
|
ol.style.DEFAULT_STROKE_STYLE = {
|
||||||
color: 'red',
|
color: '#ff0000',
|
||||||
width: 3
|
width: 3
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user