greensock-rails 1.17.0.0 → 1.18.0.0

data/vendor/assets/javascripts/greensock/jquery.gsap.js

@@ -1,6 +1,6 @@
 /*!
- * VERSION: 0.1.11
- * DATE: 2015-03-13
+ * VERSION: 0.1.12
+ * DATE: 2015-08-11
  * UPDATES AND DOCS AT: http://greensock.com/jquery-gsap-plugin/
  *
  * Requires TweenLite version 1.8.0 or higher and CSSPlugin.
@@ -140,8 +140,8 @@
 		if (config.queue !== false) {
 			obj.queue(config.queue, doAnimation); //note: the queued function will get called once for each element in the jQuery collection.
 			if (typeof(config.old) === "function") {
-				obj.queue(config.queue, function(next) {
-					config.old.call(this);
+				$(obj[obj.length-1]).queue(config.queue, function(next) {
+					config.old.call(obj);
 					next();
 				});
 			}
@@ -176,7 +176,7 @@
 		enabled:function(value) {
 			_enabled = value;
 		},
-		version:"0.1.11",
+		version:"0.1.12",
 		legacyProps:function(value) {
 			_legacyProps = _defaultLegacyProps + value + ",";
 		}

data/vendor/assets/javascripts/greensock/plugins/AttrPlugin.js

@@ -1,6 +1,6 @@
 /*!
- * VERSION: 0.4.0
- * DATE: 2015-05-06
+ * VERSION: 0.5.0
+ * DATE: 2015-08-29
  * UPDATES AND DOCS AT: http://greensock.com
  *
  * @license Copyright (c) 2008-2015, GreenSock. All rights reserved.
@@ -14,58 +14,22 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 	
 	"use strict";
 
-	var _numExp = /(?:\d|\-|\+|=|#|\.)*/g,
-		_suffixExp = /[A-Za-z%]/g;
-
 	_gsScope._gsDefine.plugin({
 		propName: "attr",
 		API: 2,
-		version: "0.4.0",
+		version: "0.5.0",
 
 		//called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run.
 		init: function(target, value, tween) {
-			var p, start, end, suffix, i;
+			var p;
 			if (typeof(target.setAttribute) !== "function") {
 				return false;
 			}
-			this._target = target;
-			this._proxy = {};
-			this._start = {}; // we record start and end values exactly as they are in case they're strings (not numbers) - we need to be able to revert to them cleanly.
-			this._end = {};
-			this._suffix = {};
 			for (p in value) {
-				this._start[p] = this._proxy[p] = start = target.getAttribute(p) + "";
-				this._end[p] = end = value[p] + "";
-				this._suffix[p] = suffix = _suffixExp.test(end) ? end.replace(_numExp, "") : _suffixExp.test(start) ? start.replace(_numExp, "") : "";
-				if (suffix) {
-					i = end.indexOf(suffix);
-					if (i !== -1) {
-						end = end.substr(0, i);
-					}
-				}
-				if(!this._addTween(this._proxy, p, parseFloat(start), end, p)) {
-					this._suffix[p] = ""; //not a valid tween - perhaps something like an <img src=""> attribute.
-				}
-				if (end.charAt(1) === "=") {
-					this._end[p] = (this._firstPT.s + this._firstPT.c) + suffix;
-				}
+				this._addTween(target, "setAttribute", target.getAttribute(p) + "", value[p] + "", p, false, p);
 				this._overwriteProps.push(p);
 			}
 			return true;
-		},
-
-		//called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.)
-		set: function(ratio) {
-			this._super.setRatio.call(this, ratio);
-			var props = this._overwriteProps,
-				i = props.length,
-				lookup = (ratio === 1) ? this._end : ratio ? this._proxy : this._start,
-				useSuffix = (lookup === this._proxy),
-				p;
-			while (--i > -1) {
-				p = props[i];
-				this._target.setAttribute(p, lookup[p] + (useSuffix ? this._suffix[p] : ""));
-			}
 		}
 
 	});

data/vendor/assets/javascripts/greensock/plugins/CSSPlugin.js

@@ -1,6 +1,6 @@
 /*!
- * VERSION: 1.17.0
- * DATE: 2015-05-27
+ * VERSION: 1.18.0
+ * DATE: 2015-09-05
  * UPDATES AND DOCS AT: http://greensock.com
  *
  * @license Copyright (c) 2008-2015, GreenSock. All rights reserved.
@@ -31,7 +31,7 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 			p = CSSPlugin.prototype = new TweenPlugin("css");
 
 		p.constructor = CSSPlugin;
-		CSSPlugin.version = "1.17.0";
+		CSSPlugin.version = "1.18.0";
 		CSSPlugin.API = 2;
 		CSSPlugin.defaultTransformPerspective = 0;
 		CSSPlugin.defaultSkewType = "compensated";
@@ -174,7 +174,7 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 					pix = (v / 100) * (horiz ? t.clientWidth : t.clientHeight);
 				} else {
 					style.cssText = "border:0 solid red;position:" + _getStyle(t, "position") + ";line-height:0;";
-					if (sfx === "%" || !node.appendChild) {
+					if (sfx === "%" || !node.appendChild || sfx.charAt(0) === "v" || sfx === "rem") {
 						node = t.parentNode || _doc.body;
 						cache = node._gsCache;
 						time = TweenLite.ticker.frame;
@@ -300,7 +300,10 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 
 			// @private Parses position-related complex strings like "top left" or "50px 10px" or "70% 20%", etc. which are used for things like transformOrigin or backgroundPosition. Optionally decorates a supplied object (recObj) with the following properties: "ox" (offsetX), "oy" (offsetY), "oxp" (if true, "ox" is a percentage not a pixel value), and "oxy" (if true, "oy" is a percentage not a pixel value)
 			_parsePosition = function(v, recObj) {
-				if (v == null || v === "" || v === "auto" || v === "auto auto") { //note: Firefox uses "auto auto" as default whereas Chrome uses "auto".
+				if (v === "contain" || v === "auto" || v === "auto auto") {
+					return v + " ";
+				}
+				if (v == null || v === "") { //note: Firefox uses "auto auto" as default whereas Chrome uses "auto".
 					v = "0 0";
 				}
 				var a = v.split(" "),
@@ -418,57 +421,96 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 			},
 
 			/**
-			 * @private Parses a color (like #9F0, #FF9900, or rgb(255,51,153)) into an array with 3 elements for red, green, and blue. Also handles rgba() values (splits into array of 4 elements of course)
+			 * @private Parses a color (like #9F0, #FF9900, rgb(255,51,153) or hsl(108, 50%, 10%)) into an array with 3 elements for red, green, and blue or if toHSL parameter is true, it will populate the array with hue, saturation, and lightness values. If a relative value is found in an hsl() or hsla() string, it will preserve those relative prefixes and all the values in the array will be strings instead of numbers (in all other cases it will be populated with numbers).
 			 * @param {(string|number)} v The value the should be parsed which could be a string like #9F0 or rgb(255,102,51) or rgba(255,0,0,0.5) or it could be a number like 0xFF00CC or even a named color like red, blue, purple, etc.
-			 * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order.
+			 * @param {(boolean)} toHSL If true, an hsl() or hsla() value will be returned instead of rgb() or rgba()
+			 * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order, or if the toHSL parameter was true, the array will contain hue, saturation and lightness (and optionally alpha) in that order. Always numbers unless there's a relative prefix found in an hsl() or hsla() string and toHSL is true.
 			 */
-			_parseColor = CSSPlugin.parseColor = function(v) {
-				var c1, c2, c3, h, s, l;
-				if (!v || v === "") {
-					return _colorLookup.black;
-				}
-				if (typeof(v) === "number") {
-					return [v >> 16, (v >> 8) & 255, v & 255];
-				}
-				if (v.charAt(v.length - 1) === ",") { //sometimes a trailing commma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value.
-					v = v.substr(0, v.length - 1);
-				}
-				if (_colorLookup[v]) {
-					return _colorLookup[v];
-				}
-				if (v.charAt(0) === "#") {
-					if (v.length === 4) { //for shorthand like #9F0
-						c1 = v.charAt(1),
-						c2 = v.charAt(2),
-						c3 = v.charAt(3);
-						v = "#" + c1 + c1 + c2 + c2 + c3 + c3;
-					}
-					v = parseInt(v.substr(1), 16);
-					return [v >> 16, (v >> 8) & 255, v & 255];
-				}
-				if (v.substr(0, 3) === "hsl") {
-					v = v.match(_numExp);
-					h = (Number(v[0]) % 360) / 360;
-					s = Number(v[1]) / 100;
-					l = Number(v[2]) / 100;
-					c2 = (l <= 0.5) ? l * (s + 1) : l + s - l * s;
-					c1 = l * 2 - c2;
-					if (v.length > 3) {
-						v[3] = Number(v[3]);
-					}
-					v[0] = _hue(h + 1 / 3, c1, c2);
-					v[1] = _hue(h, c1, c2);
-					v[2] = _hue(h - 1 / 3, c1, c2);
-					return v;
-				}
-				v = v.match(_numExp) || _colorLookup.transparent;
-				v[0] = Number(v[0]);
-				v[1] = Number(v[1]);
-				v[2] = Number(v[2]);
-				if (v.length > 3) {
-					v[3] = Number(v[3]);
+			_parseColor = CSSPlugin.parseColor = function(v, toHSL) {
+				var a, r, g, b, h, s, l, max, min, d, wasHSL;
+				if (!v) {
+					a = _colorLookup.black;
+				} else if (typeof(v) === "number") {
+					a = [v >> 16, (v >> 8) & 255, v & 255];
+				} else {
+					if (v.charAt(v.length - 1) === ",") { //sometimes a trailing comma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value.
+						v = v.substr(0, v.length - 1);
+					}
+					if (_colorLookup[v]) {
+						a = _colorLookup[v];
+					} else if (v.charAt(0) === "#") {
+						if (v.length === 4) { //for shorthand like #9F0
+							r = v.charAt(1);
+							g = v.charAt(2);
+							b = v.charAt(3);
+							v = "#" + r + r + g + g + b + b;
+						}
+						v = parseInt(v.substr(1), 16);
+						a = [v >> 16, (v >> 8) & 255, v & 255];
+					} else if (v.substr(0, 3) === "hsl") {
+						a = wasHSL = v.match(_numExp);
+						if (!toHSL) {
+							h = (Number(a[0]) % 360) / 360;
+							s = Number(a[1]) / 100;
+							l = Number(a[2]) / 100;
+							g = (l <= 0.5) ? l * (s + 1) : l + s - l * s;
+							r = l * 2 - g;
+							if (a.length > 3) {
+								a[3] = Number(v[3]);
+							}
+							a[0] = _hue(h + 1 / 3, r, g);
+							a[1] = _hue(h, r, g);
+							a[2] = _hue(h - 1 / 3, r, g);
+						} else if (v.indexOf("=") !== -1) { //if relative values are found, just return the raw strings with the relative prefixes in place.
+							return v.match(_relNumExp);
+						}
+					} else {
+						a = v.match(_numExp) || _colorLookup.transparent;
+					}
+					a[0] = Number(a[0]);
+					a[1] = Number(a[1]);
+					a[2] = Number(a[2]);
+					if (a.length > 3) {
+						a[3] = Number(a[3]);
+					}
+				}
+				if (toHSL && !wasHSL) {
+					r = a[0] / 255;
+					g = a[1] / 255;
+					b = a[2] / 255;
+					max = Math.max(r, g, b);
+					min = Math.min(r, g, b);
+					l = (max + min) / 2;
+					if (max === min) {
+						h = s = 0;
+					} else {
+						d = max - min;
+						s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+						h = (max === r) ? (g - b) / d + (g < b ? 6 : 0) : (max === g) ? (b - r) / d + 2 : (r - g) / d + 4;
+						h *= 60;
+					}
+					a[0] = (h + 0.5) | 0;
+					a[1] = (s * 100 + 0.5) | 0;
+					a[2] = (l * 100 + 0.5) | 0;
 				}
-				return v;
+				return a;
+			},
+			_formatColors = function(s, toHSL) {
+				var colors = s.match(_colorExp) || [],
+					charIndex = 0,
+					parsed = colors.length ? "" : s,
+					i, color, temp;
+				for (i = 0; i < colors.length; i++) {
+					color = colors[i];
+					temp = s.substr(charIndex, s.indexOf(color, charIndex)-charIndex);
+					charIndex += temp.length + color.length;
+					color = _parseColor(color, toHSL);
+					if (color.length === 3) {
+						color.push(1);
+					}
+					parsed += temp + (toHSL ? "hsla(" + color[0] + "," + color[1] + "%," + color[2] + "%," + color[3] : "rgba(" + color.join(",")) + ")";
+				}
+				return parsed;
 			},
 			_colorExp = "(?:\\b(?:(?:rgb|rgba|hsl|hsla)\\(.+?\\))|\\B#.+?\\b"; //we'll dynamically build this Regular Expression to conserve file size. After building it, it will be able to find rgb(), rgba(), # (hexadecimal), and named color values like red, blue, purple, etc.
 
@@ -477,6 +519,21 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 		}
 		_colorExp = new RegExp(_colorExp+")", "gi");
 
+		CSSPlugin.colorStringFilter = function(a) {
+			var combined = a[0] + a[1],
+				toHSL;
+			_colorExp.lastIndex = 0;
+			if (_colorExp.test(combined)) {
+				toHSL = (combined.indexOf("hsl(") !== -1 || combined.indexOf("hsla(") !== -1);
+				a[0] = _formatColors(a[0], toHSL);
+				a[1] = _formatColors(a[1], toHSL);
+			}
+		};
+
+		if (!TweenLite.defaultStringFilter) {
+			TweenLite.defaultStringFilter = CSSPlugin.colorStringFilter;
+		}
+
 		/**
 		 * @private Returns a formatter function that handles taking a string (or number in some cases) and returning a consistently formatted one in terms of delimiters, quantity of values, etc. For example, we may get boxShadow values defined as "0px red" or "0px 0px 10px rgb(255,0,0)" or "0px 0px 20px 20px #F00" and we need to ensure that what we get back is described with 4 numbers and a color. This allows us to feed it into the _parseComplex() method and split the values up appropriately. The neat thing about this _getFormatter() function is that the dflt defines a pattern as well as a default, so for example, _getFormatter("0px 0px 0px 0px #777", true) not only sets the default as 0px for all distances and #777 for the color, but also sets the pattern such that 4 numbers and a color will always get returned.
 		 * @param {!string} dflt The default value and pattern to follow. So "0px 0px 0px 0px #777" will ensure that 4 numbers and a color will always get returned.
@@ -766,7 +823,7 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 					ea = e.split(", ").join(",").split(" "), //ending array
 					l = ba.length,
 					autoRound = (_autoRound !== false),
-					i, xi, ni, bv, ev, bnums, enums, bn, rgba, temp, cv, str;
+					i, xi, ni, bv, ev, bnums, enums, bn, hasAlpha, temp, cv, str, useHSL;
 				if (e.indexOf(",") !== -1 || b.indexOf(",") !== -1) {
 					ba = ba.join(" ").replace(_commasOutsideParenExp, ", ").split(" ");
 					ea = ea.join(" ").replace(_commasOutsideParenExp, ", ").split(" ");
@@ -779,6 +836,7 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 				}
 				pt.plugin = plugin;
 				pt.setRatio = setRatio;
+				_colorExp.lastIndex = 0;
 				for (i = 0; i < l; i++) {
 					bv = ba[i];
 					ev = ea[i];
@@ -788,26 +846,35 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 						pt.appendXtra("", bn, _parseChange(ev, bn), ev.replace(_relNumExp, ""), (autoRound && ev.indexOf("px") !== -1), true);
 
 					//if the value is a color
-					} else if (clrs && (bv.charAt(0) === "#" || _colorLookup[bv] || _rgbhslExp.test(bv))) {
+					} else if (clrs && _colorExp.test(bv)) {
 						str = ev.charAt(ev.length - 1) === "," ? ")," : ")"; //if there's a comma at the end, retain it.
-						bv = _parseColor(bv);
-						ev = _parseColor(ev);
-						rgba = (bv.length + ev.length > 6);
-						if (rgba && !_supportsOpacity && ev[3] === 0) { //older versions of IE don't support rgba(), so if the destination alpha is 0, just use "transparent" for the end color
+						useHSL = (ev.indexOf("hsl") !== -1 && _supportsOpacity);
+						bv = _parseColor(bv, useHSL);
+						ev = _parseColor(ev, useHSL);
+						hasAlpha = (bv.length + ev.length > 6);
+						if (hasAlpha && !_supportsOpacity && ev[3] === 0) { //older versions of IE don't support rgba(), so if the destination alpha is 0, just use "transparent" for the end color
 							pt["xs" + pt.l] += pt.l ? " transparent" : "transparent";
 							pt.e = pt.e.split(ea[i]).join("transparent");
 						} else {
 							if (!_supportsOpacity) { //old versions of IE don't support rgba().
-								rgba = false;
+								hasAlpha = false;
 							}
-							pt.appendXtra((rgba ? "rgba(" : "rgb("), bv[0], ev[0] - bv[0], ",", true, true)
-								.appendXtra("", bv[1], ev[1] - bv[1], ",", true)
-								.appendXtra("", bv[2], ev[2] - bv[2], (rgba ? "," : str), true);
-							if (rgba) {
+							if (useHSL) {
+								pt.appendXtra((hasAlpha ? "hsla(" : "hsl("), bv[0], _parseChange(ev[0], bv[0]), ",", false, true)
+									.appendXtra("", bv[1], _parseChange(ev[1], bv[1]), "%,", false)
+									.appendXtra("", bv[2], _parseChange(ev[2], bv[2]), (hasAlpha ? "%," : "%" + str), false);
+							} else {
+								pt.appendXtra((hasAlpha ? "rgba(" : "rgb("), bv[0], ev[0] - bv[0], ",", true, true)
+									.appendXtra("", bv[1], ev[1] - bv[1], ",", true)
+									.appendXtra("", bv[2], ev[2] - bv[2], (hasAlpha ? "," : str), true);
+							}
+
+							if (hasAlpha) {
 								bv = (bv.length < 4) ? 1 : bv[3];
 								pt.appendXtra("", bv, ((ev.length < 4) ? 1 : ev[3]) - bv, str, false);
 							}
 						}
+						_colorExp.lastIndex = 0; //otherwise the test() on the RegExp could move the lastIndex and taint future results.
 
 					} else {
 						bnums = bv.match(_numExp); //gets each group of numbers in the beginning value string and drops them into an array
@@ -1681,14 +1748,22 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 			if (cssp._lastParsedTransform === vars) { return pt; } //only need to parse the transform once, and only if the browser supports it.
 			cssp._lastParsedTransform = vars;
 			var originalGSTransform = t._gsTransform,
-				m1 = cssp._transform = _getTransform(t, _cs, true, vars.parseTransform),
 				style = t.style,
 				min = 0.000001,
 				i = _transformProps.length,
 				v = vars,
 				endRotations = {},
 				transformOriginString = "transformOrigin",
-				m2, skewY, copy, orig, has3D, hasChange, dr, x, y;
+				m1, m2, skewY, copy, orig, has3D, hasChange, dr, x, y;
+			if (vars.display) { //if the user is setting display during this tween, it may not be instantiated yet but we must force it here in order to get accurate readings. If display is "none", some browsers refuse to report the transform properties correctly.
+				copy = _getStyle(t, "display");
+				style.display = "block";
+				m1 = _getTransform(t, _cs, true, vars.parseTransform);
+				style.display = copy;
+			} else {
+				m1 = _getTransform(t, _cs, true, vars.parseTransform);
+			}
+			cssp._transform = m1;
 			if (typeof(v.transform) === "string" && _transformProp) { //for values like transform:"rotate(60deg) scale(0.5, 0.8)"
 				copy = _tempDiv.style; //don't use the original target because it might be SVG in which case some browsers don't report computed style correctly.
 				copy[_transformProp] = v.transform;
@@ -1697,6 +1772,9 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 				_doc.body.appendChild(_tempDiv);
 				m2 = _getTransform(_tempDiv, null, false);
 				_doc.body.removeChild(_tempDiv);
+				if (!m2.perspective) {
+					m2.perspective = m1.perspective; //tweening to no perspective gives very unintuitive results - just keep the same perspective in that case.
+				}
 				if (v.xPercent != null) {
 					m2.xPercent = _parseVal(v.xPercent, m1.xPercent);
 				}
@@ -2294,8 +2372,8 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 									bs = bn + "%";
 								}
 
-							} else if (esfx === "em") {
-								bn /= _convertToPixels(target, p, 1, "em");
+							} else if (esfx === "em" || esfx === "rem") {
+								bn /= _convertToPixels(target, p, 1, esfx);
 
 							//otherwise convert to pixels.
 							} else if (esfx !== "px") {

data/vendor/assets/javascripts/greensock/plugins/ColorPropsPlugin.js

@@ -1,6 +1,6 @@
 /*!
- * VERSION: beta 1.3.0
- * DATE: 2015-02-06
+ * VERSION: beta 1.4.0
+ * DATE: 2015-09-03
  * UPDATES AND DOCS AT: http://greensock.com
  *
  * @license Copyright (c) 2008-2015, GreenSock. All rights reserved.
@@ -15,6 +15,7 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 	"use strict";
 
 	var _numExp = /(\d|\.)+/g,
+		_relNumExp = /(?:\d|\-\d|\.\d|\-\.\d|\+=\d|\-=\d|\+=.\d|\-=\.\d)+/g,
 		_colorLookup = {aqua:[0,255,255],
 			lime:[0,255,0],
 			silver:[192,192,192],
@@ -39,88 +40,185 @@ var _gsScope = (typeof(module) !== "undefined" && module.exports && typeof(globa
 			h = (h < 0) ? h + 1 : (h > 1) ? h - 1 : h;
 			return ((((h * 6 < 1) ? m1 + (m2 - m1) * h * 6 : (h < 0.5) ? m2 : (h * 3 < 2) ? m1 + (m2 - m1) * (2 / 3 - h) * 6 : m1) * 255) + 0.5) | 0;
 		},
-		_parseColor = function(color) {
-			if (color === "" || color == null || color === "none") {
-				return _colorLookup.transparent;
-			}
-			if (_colorLookup[color]) {
-				return _colorLookup[color];
-			}
-			if (typeof(color) === "number") {
-				return [color >> 16, (color >> 8) & 255, color & 255];
+		/**
+		 * @private Parses a color (like #9F0, #FF9900, rgb(255,51,153) or hsl(108, 50%, 10%)) into an array with 3 elements for red, green, and blue or if toHSL parameter is true, it will populate the array with hue, saturation, and lightness values. If a relative value is found in an hsl() or hsla() string, it will preserve those relative prefixes and all the values in the array will be strings instead of numbers (in all other cases it will be populated with numbers).
+		 * @param {(string|number)} v The value the should be parsed which could be a string like #9F0 or rgb(255,102,51) or rgba(255,0,0,0.5) or it could be a number like 0xFF00CC or even a named color like red, blue, purple, etc.
+		 * @param {(boolean)} toHSL If true, an hsl() or hsla() value will be returned instead of rgb() or rgba()
+		 * @return {Array.<number>} An array containing red, green, and blue (and optionally alpha) in that order, or if the toHSL parameter was true, the array will contain hue, saturation and lightness (and optionally alpha) in that order. Always numbers unless there's a relative prefix found in an hsl() or hsla() string and toHSL is true.
+		 */
+		_parseColor = function(v, toHSL) {
+			var a, r, g, b, h, s, l, max, min, d, wasHSL;
+			if (!v) {
+				a = _colorLookup.black;
+			} else if (typeof(v) === "number") {
+				a = [v >> 16, (v >> 8) & 255, v & 255];
+			} else {
+				if (v.charAt(v.length - 1) === ",") { //sometimes a trailing comma is included and we should chop it off (typically from a comma-delimited list of values like a textShadow:"2px 2px 2px blue, 5px 5px 5px rgb(255,0,0)" - in this example "blue," has a trailing comma. We could strip it out inside parseComplex() but we'd need to do it to the beginning and ending values plus it wouldn't provide protection from other potential scenarios like if the user passes in a similar value.
+					v = v.substr(0, v.length - 1);
+				}
+				if (_colorLookup[v]) {
+					a = _colorLookup[v];
+				} else if (v.charAt(0) === "#") {
+					if (v.length === 4) { //for shorthand like #9F0
+						r = v.charAt(1);
+						g = v.charAt(2);
+						b = v.charAt(3);
+						v = "#" + r + r + g + g + b + b;
+					}
+					v = parseInt(v.substr(1), 16);
+					a = [v >> 16, (v >> 8) & 255, v & 255];
+				} else if (v.substr(0, 3) === "hsl") {
+					a = wasHSL = v.match(_numExp);
+					if (!toHSL) {
+						h = (Number(a[0]) % 360) / 360;
+						s = Number(a[1]) / 100;
+						l = Number(a[2]) / 100;
+						g = (l <= 0.5) ? l * (s + 1) : l + s - l * s;
+						r = l * 2 - g;
+						if (a.length > 3) {
+							a[3] = Number(v[3]);
+						}
+						a[0] = _hue(h + 1 / 3, r, g);
+						a[1] = _hue(h, r, g);
+						a[2] = _hue(h - 1 / 3, r, g);
+					} else if (v.indexOf("=") !== -1) { //if relative values are found, just return the raw strings with the relative prefixes in place.
+						return v.match(_relNumExp);
+					}
+				} else {
+					a = v.match(_numExp) || _colorLookup.transparent;
+				}
+				a[0] = Number(a[0]);
+				a[1] = Number(a[1]);
+				a[2] = Number(a[2]);
+				if (a.length > 3) {
+					a[3] = Number(a[3]);
+				}
 			}
-			if (color.charAt(0) === "#") {
-				if (color.length === 4) { //for shorthand like #9F0
-					color = "#" + color.charAt(1) + color.charAt(1) + color.charAt(2) + color.charAt(2) + color.charAt(3) + color.charAt(3);
+			if (toHSL && !wasHSL) {
+				r = a[0] / 255;
+				g = a[1] / 255;
+				b = a[2] / 255;
+				max = Math.max(r, g, b);
+				min = Math.min(r, g, b);
+				l = (max + min) / 2;
+				if (max === min) {
+					h = s = 0;
+				} else {
+					d = max - min;
+					s = l > 0.5 ? d / (2 - max - min) : d / (max + min);
+					h = (max === r) ? (g - b) / d + (g < b ? 6 : 0) : (max === g) ? (b - r) / d + 2 : (r - g) / d + 4;
+					h *= 60;
 				}
-				color = parseInt(color.substr(1), 16);
-				return [color >> 16, (color >> 8) & 255, color & 255];
+				a[0] = (h + 0.5) | 0;
+				a[1] = (s * 100 + 0.5) | 0;
+				a[2] = (l * 100 + 0.5) | 0;
 			}
-			if (color.substr(0, 3) === "hsl") {
-				color = color.match(_numExp);
-				var h = (Number(color[0]) % 360) / 360,
-					s = Number(color[1]) / 100,
-					l = Number(color[2]) / 100,
-					m2 = (l <= 0.5) ? l * (s + 1) : l + s - l * s,
-					m1 = l * 2 - m2;
-				if (color.length > 3) {
-					color[3] = Number(color[3]);
+			return a;
+		},
+		_formatColors = function(s, toHSL) {
+			var colors = s.match(_colorExp) || [],
+				charIndex = 0,
+				parsed = colors.length ? "" : s,
+				i, color, temp;
+			for (i = 0; i < colors.length; i++) {
+				color = colors[i];
+				temp = s.substr(charIndex, s.indexOf(color, charIndex)-charIndex);
+				charIndex += temp.length + color.length;
+				color = _parseColor(color, toHSL);
+				if (color.length === 3) {
+					color.push(1);
 				}
-				color[0] = _hue(h + 1 / 3, m1, m2);
-				color[1] = _hue(h, m1, m2);
-				color[2] = _hue(h - 1 / 3, m1, m2);
-				return color;
+				parsed += temp + (toHSL ? "hsla(" + color[0] + "," + color[1] + "%," + color[2] + "%," + color[3] : "rgba(" + color.join(",")) + ")";
 			}
-			return color.match(_numExp) || _colorLookup.transparent;
-		};
+			return parsed;
+		}, p, _colorStringFilter,
+		TweenLite = _gsScope.TweenLite,
+		_colorExp = "(?:\\b(?:(?:rgb|rgba|hsl|hsla)\\(.+?\\))|\\B#.+?\\b", //we'll dynamically build this Regular Expression to conserve file size. After building it, it will be able to find rgb(), rgba(), # (hexadecimal), and named color values like red, blue, purple, etc.
+
 
-	_gsScope._gsDefine.plugin({
-		propName: "colorProps",
-		version: "1.3.0",
-		priority: -1,
-		API: 2,
 
-		//called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run.
-		init: function(target, value, tween) {
-			this._target = target;
-			var p, s, c, pt;
-			this.numFormat = (value.format === "number");
-			for (p in value) {
-				if (p !== "format") {
-					c = _parseColor(value[p]);
-					this._firstPT = pt = {_next:this._firstPT, p:p, f:(typeof(target[p]) === "function"), n:p, r:false};
-					s = _parseColor( (!pt.f) ? target[p] : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ]() );
-					pt.s = Number(s[0]);
-					pt.c = Number(c[0]) - pt.s;
-					pt.gs = Number(s[1]);
-					pt.gc = Number(c[1]) - pt.gs;
-					pt.bs = Number(s[2]);
-					pt.bc = Number(c[2]) - pt.bs;
-					if ((pt.rgba = (s.length > 3 || c.length > 3))) { //detect an rgba() value
-						pt.as = (s.length < 4) ? 1 : Number(s[3]);
-						pt.ac = ((c.length < 4) ? 1 : Number(c[3])) - pt.as;
+		ColorPropsPlugin = _gsScope._gsDefine.plugin({
+			propName: "colorProps",
+			version: "1.4.0",
+			priority: -1,
+			API: 2,
+			global: true,
+
+			//called when the tween renders for the first time. This is where initial values should be recorded and any setup routines should run.
+			init: function(target, value, tween) {
+				var p, proxy, pt;
+				this._target = target;
+				this._proxy = proxy = ((value.format + "").toUpperCase() === "NUMBER") ? {} : 0;
+				for (p in value) {
+					if (p !== "format") {
+						if (proxy) {
+							this._firstNumPT = pt = {_next:this._firstNumPT, t:target, p:p, f:(typeof(target[p]) === "function")};
+							proxy[p] = !pt.f ? target[p] : target[ ((p.indexOf("set") || typeof(target["get" + p.substr(3)]) !== "function") ? p : "get" + p.substr(3)) ]();
+						}
+						this._addTween(proxy || target, p, "get", value[p], p, null, null, _colorStringFilter);
 					}
-					if (pt._next) {
-						pt._next._prev = pt;
+				}
+				return true;
+			},
+
+			//called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.)
+			set: function(v) {
+				var pt = this._firstNumPT,
+					val;
+				this._super.setRatio.call(this, v);
+				while (pt) {
+					val = _parseColor(this._proxy[pt.p], false);
+					val = val[0] << 16 | val[1] << 8 | val[2];
+					if (pt.f) {
+						this._target[pt.p](val);
+					} else {
+						this._target[pt.p] = val;
 					}
+					pt = pt._next;
 				}
 			}
-			return true;
-		},
+		});
 
-		//called each time the values should be updated, and the ratio gets passed as the only parameter (typically it's a value between 0 and 1, but it can exceed those when using an ease like Elastic.easeOut or Back.easeOut, etc.)
-		set: function(v) {
-			var pt = this._firstPT, val;
-			while (pt) {
-				val = this.numFormat ? (pt.s + (v * pt.c)) << 16 | (pt.gs + (v * pt.gc)) << 8 | (pt.bs + (v * pt.bc)) : (pt.rgba ? "rgba(" : "rgb(") + ((pt.s + (v * pt.c)) >> 0) + ", " + ((pt.gs + (v * pt.gc)) >> 0) + ", " + ((pt.bs + (v * pt.bc)) >> 0) + (pt.rgba ? ", " + (pt.as + (v * pt.ac)) : "") + ")";
-				if (pt.f) {
-					this._target[pt.p](val);
-				} else {
-					this._target[pt.p] = val;
+	for (p in _colorLookup) {
+		_colorExp += "|" + p + "\\b";
+	}
+	_colorExp = new RegExp(_colorExp+")", "gi");
+
+	ColorPropsPlugin.colorStringFilter = _colorStringFilter = function(a) {
+		var combined = a[0] + a[1],
+			toHSL;
+		_colorExp.lastIndex = 0;
+		if (_colorExp.test(combined)) {
+			toHSL = (combined.indexOf("hsl(") !== -1 || combined.indexOf("hsla(") !== -1);
+			a[0] = _formatColors(a[0], toHSL);
+			a[1] = _formatColors(a[1], toHSL);
+		}
+	};
+
+	if (!TweenLite.defaultStringFilter) {
+		TweenLite.defaultStringFilter = ColorPropsPlugin.colorStringFilter;
+	}
+
+	ColorPropsPlugin.parseColor = _parseColor;
+	p = ColorPropsPlugin.prototype;
+	p._firstNumPT = null;
+	p._kill = function(lookup) {
+		var pt = this._firstNumPT,
+			prev;
+		while (pt) {
+			if (pt.p in lookup) {
+				if (pt === p._firstNumPT) {
+					this._firstNumPT = pt._next;
+				}
+				if (prev) {
+					prev._next = pt._next;
 				}
-				pt = pt._next;
+			} else {
+				prev = pt;
 			}
+			pt = pt._next;
 		}
-	});
+		return this._super._kill(lookup);
+	};
 
 }); if (_gsScope._gsDefine) { _gsScope._gsQueue.pop()(); }