|
123 | 123 | * @return {number} The number value.
|
124 | 124 | */
|
125 | 125 | sigma.utils.floatColor = function(val) {
|
126 |
| - var result = [0, 0, 0]; |
127 |
| - |
128 |
| - if (val.match(/^#/)) { |
129 |
| - val = (val || '').replace(/^#/, ''); |
130 |
| - result = (val.length === 3) ? |
131 |
| - [ |
132 |
| - parseInt(val.charAt(0) + val.charAt(0), 16), |
133 |
| - parseInt(val.charAt(1) + val.charAt(1), 16), |
134 |
| - parseInt(val.charAt(2) + val.charAt(2), 16) |
135 |
| - ] : |
136 |
| - [ |
137 |
| - parseInt(val.charAt(0) + val.charAt(1), 16), |
138 |
| - parseInt(val.charAt(2) + val.charAt(3), 16), |
139 |
| - parseInt(val.charAt(4) + val.charAt(5), 16) |
140 |
| - ]; |
| 126 | + var r = 0, |
| 127 | + g = 0, |
| 128 | + b = 0; |
| 129 | + |
| 130 | + if (val[0] === '#') { |
| 131 | + val = val.slice(1); |
| 132 | + |
| 133 | + if (val.length === 3) { |
| 134 | + r = parseInt(val.charAt(0) + val.charAt(0), 16); |
| 135 | + g = parseInt(val.charAt(1) + val.charAt(1), 16); |
| 136 | + b = parseInt(val.charAt(2) + val.charAt(2), 16); |
| 137 | + } |
| 138 | + else { |
| 139 | + r = parseInt(val.charAt(0) + val.charAt(1), 16); |
| 140 | + g = parseInt(val.charAt(2) + val.charAt(3), 16); |
| 141 | + b = parseInt(val.charAt(4) + val.charAt(5), 16); |
| 142 | + } |
141 | 143 | } else if (val.match(/^ *rgba? *\(/)) {
|
142 | 144 | val = val.match(
|
143 | 145 | /^ *rgba? *\( *([0-9]*) *, *([0-9]*) *, *([0-9]*) *(,.*)?\) *$/
|
144 | 146 | );
|
145 |
| - result = [ |
146 |
| - +val[1], |
147 |
| - +val[2], |
148 |
| - +val[3] |
149 |
| - ]; |
| 147 | + r = +val[1]; |
| 148 | + g = +val[2]; |
| 149 | + b = +val[3]; |
150 | 150 | }
|
151 | 151 |
|
152 | 152 | return (
|
153 |
| - result[0] * 256 * 256 + |
154 |
| - result[1] * 256 + |
155 |
| - result[2] |
| 153 | + r * 256 * 256 + |
| 154 | + g * 256 + |
| 155 | + b |
156 | 156 | );
|
157 | 157 | };
|
158 | 158 |
|
|
0 commit comments