mirror of
https://github.com/scratchfoundation/paper.js.git
synced 2025-01-01 02:38:43 -05:00
Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
77f1e22727
1 changed files with 1 additions and 1 deletions
|
@ -35,7 +35,7 @@ Color = Base.extend({
|
||||||
var index = index || 0, length = args.length - index;
|
var index = index || 0, length = args.length - index;
|
||||||
if (length == 1 && args[index] instanceof Color) {
|
if (length == 1 && args[index] instanceof Color) {
|
||||||
return args[index];
|
return args[index];
|
||||||
} else if (length != 0) {
|
} else if (length != 0 && args[0] !== null) {
|
||||||
var rgbColor = new RGBColor(RGBColor.dont);
|
var rgbColor = new RGBColor(RGBColor.dont);
|
||||||
rgbColor.initialize.apply(rgbColor, index > 0
|
rgbColor.initialize.apply(rgbColor, index > 0
|
||||||
? Array.prototype.slice.call(args, index) : args);
|
? Array.prototype.slice.call(args, index) : args);
|
||||||
|
|
Loading…
Reference in a new issue