scratchfoundation/paper.js
1
0
Fork 0
mirror of https://github.com/scratchfoundation/paper.js.git synced 2025-01-22 07:19:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Optimize Color#initialize for minifying.

Browse source
This commit is contained in:
Jonathan Puckey 2011-05-21 17:40:29 +02:00
parent f83d16906c
commit f3deed81cd
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/color/Color.js
View file

@ -142,9 +142,10 @@ var Color = this.Color = Base.extend(new function() {
_readNull: true,
initialize: function(arg) {
var isArray = Array.isArray(arg);
var isArray = Array.isArray(arg),
colorType = this._colorType;
if (typeof arg === 'object' && !isArray) {
if (!this._colorType) {
if (!colorType) {
// Called on the abstract Color class. Guess color type
// from arg
return arg.red !== undefined
@ -160,21 +161,21 @@ var Color = this.Color = Base.extend(new function() {
// color.
var color = arg._colorType ? arg
: Color.read(arguments, 0, 1);
return (this._colorType !== color._colorType)
? color.convert(this._colorType)
return (colorType !== color._colorType)
? color.convert(colorType)
: color.clone();
}
} else if (typeof arg === 'string') {
var rgbColor = arg.match(/^#[0-9a-f]{3,6}$/i)
? hexToRGBColor(arg)
: nameToRGBColor(arg);
return this._colorType
? rgbColor.convert(this._colorType)
return colorType
? rgbColor.convert(colorType)
: rgbColor;
} else {
var components = isArray ? arg
: Array.prototype.slice.call(arguments);
if (!this._colorType) {
if (!colorType) {
// Called on the abstract Color class. Guess color type
// from arg
//if (components.length >= 4)