diff options
| author | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
|---|---|---|
| committer | Andrew Dolgov <[email protected]> | 2011-11-08 20:40:44 +0400 |
| commit | 81bea17aefb26859f825b9293c7c99192874806e (patch) | |
| tree | fb244408ca271affa2899adb634788802c9a89d8 /lib/dojo/colors.js | |
| parent | 870a70e109ac9e80a88047044530de53d0404ec7 (diff) | |
upgrade Dojo to 1.6.1
Diffstat (limited to 'lib/dojo/colors.js')
| -rw-r--r-- | lib/dojo/colors.js | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/dojo/colors.js b/lib/dojo/colors.js index 1f41dc3c7..dfb8f89e6 100644 --- a/lib/dojo/colors.js +++ b/lib/dojo/colors.js @@ -1,5 +1,5 @@ /* - Copyright (c) 2004-2010, The Dojo Foundation All Rights Reserved. + Copyright (c) 2004-2011, The Dojo Foundation All Rights Reserved. Available via Academic Free License >= 2.1 OR the modified BSD license. see: http://dojotoolkit.org/license for details */ @@ -9,6 +9,8 @@ if(!dojo._hasResource["dojo.colors"]){ //_hasResource checks added by build. Do dojo._hasResource["dojo.colors"] = true; dojo.provide("dojo.colors"); +dojo.getObject("colors", true, dojo); + //TODO: this module appears to break naming conventions /*===== @@ -55,9 +57,9 @@ dojo.colors = { var H = ((parseFloat(c[0]) % 360) + 360) % 360 / 360, S = parseFloat(c[1]) / 100, L = parseFloat(c[2]) / 100, - // calculate rgb according to the algorithm - // recommended by the CSS3 Color Module - m2 = L <= 0.5 ? L * (S + 1) : L + S - L * S, + // calculate rgb according to the algorithm + // recommended by the CSS3 Color Module + m2 = L <= 0.5 ? L * (S + 1) : L + S - L * S, m1 = 2 * L - m2; a = [ hue2rgb(m1, m2, H + 1 / 3) * 256, |