From 26efbdb451a30f1308a786363bcf5f43397e8708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Lehni?= <juerg@scratchdisk.com>
Date: Tue, 9 Apr 2013 09:20:32 -0700
Subject: [PATCH] Implement argument reading for Gradient objects.

---
 examples/JSON/Gradients.html | 10 +++++-----
 src/color/Color.js           |  3 +++
 src/color/Gradient.js        | 10 ++++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/examples/JSON/Gradients.html b/examples/JSON/Gradients.html
index ce2c961e..b3826e5d 100644
--- a/examples/JSON/Gradients.html
+++ b/examples/JSON/Gradients.html
@@ -7,11 +7,11 @@
 	<script type="text/javascript" src="../../dist/paper.js"></script>
 	<script type="text/paperscript" canvas="canvas1">
 		var path = new Path.Circle(view.center, view.bounds.height * 0.4);
-		var gradient = new Gradient(['yellow', 'red', 'black'], true);
-		var from = path.position;
-		var to = path.bounds.rightCenter;
-		var gradientColor = new Color(gradient, from, to);
-		path.fillColor = gradientColor;
+		path.fillColor = {
+			gradient: [['yellow', 'red', 'black'], true],
+			origin: path.position,
+			destination: path.bounds.rightCenter 
+		}
 		path.strokeColor = 'black';
 		window._json = project.exportJson();
 		console.log(window._json);
diff --git a/src/color/Color.js b/src/color/Color.js
index 554926e3..bf6188fe 100644
--- a/src/color/Color.js
+++ b/src/color/Color.js
@@ -226,6 +226,9 @@ var Color = this.Color = Base.extend(new function() {
 				parser = parsers[type][index] = name === 'gradient'
 					? function(value) {
 						var current = this._components[0];
+						value = Gradient.read(
+								Array.isArray(value) ? value : arguments,
+								0, 0, false, true); // readNull
 						if (current !== value) {
 							if (current)
 								current._removeOwner(this);
diff --git a/src/color/Gradient.js b/src/color/Gradient.js
index d632b778..478681ae 100644
--- a/src/color/Gradient.js
+++ b/src/color/Gradient.js
@@ -21,10 +21,12 @@ var Gradient = this.Gradient = Base.extend(/** @lends Gradient# */{
 	initialize: function(stops, radial) {
 		// Define this Gradient's unique id.
 		this._id = ++Base._uid;
-		this.setStops(stops || ['white', 'black']);
-		// Support old version of string type argument and new radial boolean.
-		this.setRadial(typeof radial === 'string' && radial === 'radial'
-				|| radial || false);
+		if (!stops || !this._set(stops)) {
+			this.setStops(stops || ['white', 'black']);
+			// Support old string type argument and new radial boolean.
+			this.setRadial(typeof radial === 'string' && radial === 'radial'
+					|| radial || false);
+		}
 	},
 
 	_serialize: function(options, dictionary) {