0x2620/oxjs
2
0
Fork 1
Code Issues 172 Pull requests Releases Wiki Activity

Allow for grayscale elements in Ox.Theme.formatColor

Browse source
This commit is contained in:
rolux 2013-01-02 13:10:17 +01:00
parent 75ca6818e4
commit f20836eacf
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/Ox.UI/js/Core/Theme.js
View file

@ -28,7 +28,7 @@ Ox.Theme = (function() {
} }
function renderElement(value, type) { function renderElement(value, type) {
var $element, background, color, data = that.getThemeData(); var $element, background, color, data = that.getThemeData(), saturation;
if (type == 'hue') { if (type == 'hue') {
background = Ox.rgb(value, 1, data.themeBackgroundLightness); background = Ox.rgb(value, 1, data.themeBackgroundLightness);
color = Ox.rgb(value, 1, data.themeColorLightness); color = Ox.rgb(value, 1, data.themeColorLightness);
@ -45,12 +45,13 @@ Ox.Theme = (function() {
return Math.round(value * 255) + (value < 0.5 ? 128 : -128); return Math.round(value * 255) + (value < 0.5 ? 128 : -128);
}); });
} else if (type == 'gradient') { } else if (type == 'gradient') {
saturation = value === null ? 0 : 1;
background = Ox.range(2).map(function(i) { background = Ox.range(2).map(function(i) {
return Ox.rgb(value, 1, data.themeBackgroundLightness).map(function(value) { return Ox.rgb(value || 0, saturation, data.themeBackgroundLightness).map(function(value) {
return value + (i == 0 ? 16 : -16); return (value || 0) + (i == 0 ? 16 : -16);
}); });
}); });
color = Ox.rgb(value, 1, data.themeColorLightness); color = Ox.rgb(value || 0, saturation, data.themeColorLightness);
} }
$element = $('<div>') $element = $('<div>')
.addClass( .addClass(
@ -134,7 +135,7 @@ Ox.Theme = (function() {
that.formatColor = function(value, type) { that.formatColor = function(value, type) {
return renderElement(value, type) return renderElement(value, type)
.css({textAlign: 'center'}) .css({textAlign: 'center'})
.html(Ox.formatNumber(value, 3)); .html(value === null ? '' : Ox.formatNumber(value, 3));
}; };
/*@ /*@