From d9cd60bc0c026adff6303869934bb58fc832e82f Mon Sep 17 00:00:00 2001
From: Pete Hopkins <phopkins@twitter.com>
Date: Thu, 20 Aug 2015 09:57:31 -0400
Subject: [PATCH] "finishAll" functionality

Adds an option to finish all animations on an element's queue, not
just the currently-running one.
---
 test/index.html |  57 +++-
 velocity.js     | 824 +++++++++++++++++++++++++-----------------------
 2 files changed, 477 insertions(+), 404 deletions(-)

diff --git a/test/index.html b/test/index.html
index e668129a..6237de5e 100644
--- a/test/index.html
+++ b/test/index.html
@@ -42,7 +42,6 @@
 		<script>
 
 		// Needed tests:
-		// - "finish"
 		// - new stop behvaior
 		// - e/p/o shorthands
 
@@ -986,6 +985,62 @@
 			}, asyncCheckDuration);
 		});
 
+		/******************
+		   Command: Finish
+		******************/
+
+		QUnit.asyncTest("Command: Finish / FinishAll", function() {
+			expect(9);
+
+			var $target1 = getTarget();
+			/* Ensure an error isn't thrown when "finish" is called on a $target that isn't animating. */
+			Velocity($target1, "finish");
+
+			/* Animate to defaultProperties, and then "finish" to jump to the end of it. */
+			Velocity($target1, defaultProperties, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000}));
+			Velocity($target1, "finish");
+
+			setTimeout(function() {
+				/* Ensure "finish" has removed all queued animations. */
+				/* We're using the element's queue length as a proxy. 0 and 1 both mean that the element's queue has been cleared -- a length of 1 just indicates that the animation is in progress. */
+				equal(Velocity.Utilities.queue($target1).length <= 1, true, "Queue cleared.");
+
+				/* End result of the animation should be applied */
+				equal(parseFloat(Velocity.CSS.getPropertyValue($target1, "width")), defaultProperties.width, "Standard end value #1 was set.");
+				equal(parseFloat(Velocity.CSS.getPropertyValue($target1, "opacity")), defaultProperties.opacity, "Standard end value #2 was set.");
+			}, asyncCheckDuration);
+
+			var $target2 = getTarget();
+			Velocity($target2, { opacity: 0 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
+			Velocity($target2, { width: 0 }, defaultOptions);
+			Velocity($target2, "finish");
+
+			var $target3 = getTarget();
+			Velocity($target3, { opacity: 0, width: 50 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
+			Velocity($target3, { width: 0 }, defaultOptions);
+			Velocity($target3, { width: 100 }, defaultOptions);
+			Velocity($target3, "finish", true);
+
+			var $target4 = getTarget();
+			Velocity($target4, { opacity: 0, width: 50 }, Velocity.Utilities.extend({}, defaultOptions, { delay: 1000 }));
+			Velocity($target4, { width: 0 }, defaultOptions);
+			Velocity($target4, { width: 100 }, defaultOptions);
+			Velocity($target4, "finishAll", true);
+
+			setTimeout(function() {
+				equal(Data($target2, pluginName).tweensContainer.opacity, undefined, "Active call stopped.");
+				notEqual(Data($target2, pluginName).tweensContainer.width, undefined, "Next queue item started.");
+
+				equal(Velocity.Utilities.queue($target3, "").length, 0, "Full queue array cleared.");
+				equal(parseFloat(Velocity.CSS.getPropertyValue($target3, "width")), 50, "Just the first call's width was applied.");
+
+				equal(Velocity.Utilities.queue($target4, "").length, 0, "Full queue array cleared.");
+				equal(parseFloat(Velocity.CSS.getPropertyValue($target4, "width")), 100, "The last call's width was applied.");
+
+				start();
+			}, asyncCheckDuration);
+		});
+
 		/***********************
 		   Feature: Redirects
 		***********************/
diff --git a/velocity.js b/velocity.js
index 7c2f9965..8327ce65 100644
--- a/velocity.js
+++ b/velocity.js
@@ -1,405 +1,405 @@
 /*! VelocityJS.org (1.2.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
 
-/*************************
-   Velocity jQuery Shim
-*************************/
-
-/*! VelocityJS.org jQuery Shim (1.0.1). (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */
-
-/* This file contains the jQuery functions that Velocity relies on, thereby removing Velocity's dependency on a full copy of jQuery, and allowing it to work in any environment. */
-/* These shimmed functions are only used if jQuery isn't present. If both this shim and jQuery are loaded, Velocity defaults to jQuery proper. */
-/* Browser support: Using this shim instead of jQuery proper removes support for IE8. */
-
-;(function (window) {
-    /***************
-         Setup
-    ***************/
-
-    /* If jQuery is already loaded, there's no point in loading this shim. */
-    if (window.jQuery) {
-        return;
-    }
-
-    /* jQuery base. */
-    var $ = function (selector, context) {
-        return new $.fn.init(selector, context);
-    };
-
-    /********************
-       Private Methods
-    ********************/
-
-    /* jQuery */
-    $.isWindow = function (obj) {
-        /* jshint eqeqeq: false */
-        return obj != null && obj == obj.window;
-    };
-
-    /* jQuery */
-    $.type = function (obj) {
-        if (obj == null) {
-            return obj + "";
-        }
-
-        return typeof obj === "object" || typeof obj === "function" ?
-            class2type[toString.call(obj)] || "object" :
-            typeof obj;
-    };
-
-    /* jQuery */
-    $.isArray = Array.isArray || function (obj) {
-        return $.type(obj) === "array";
-    };
-
-    /* jQuery */
-    function isArraylike (obj) {
-        var length = obj.length,
-            type = $.type(obj);
-
-        if (type === "function" || $.isWindow(obj)) {
-            return false;
-        }
-
-        if (obj.nodeType === 1 && length) {
-            return true;
-        }
-
-        return type === "array" || length === 0 || typeof length === "number" && length > 0 && (length - 1) in obj;
-    }
-
-    /***************
-       $ Methods
-    ***************/
-
-    /* jQuery: Support removed for IE<9. */
-    $.isPlainObject = function (obj) {
-        var key;
-
-        if (!obj || $.type(obj) !== "object" || obj.nodeType || $.isWindow(obj)) {
-            return false;
-        }
-
-        try {
-            if (obj.constructor &&
-                !hasOwn.call(obj, "constructor") &&
-                !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) {
-                return false;
-            }
-        } catch (e) {
-            return false;
-        }
-
-        for (key in obj) {}
-
-        return key === undefined || hasOwn.call(obj, key);
-    };
-
-    /* jQuery */
-    $.each = function(obj, callback, args) {
-        var value,
-            i = 0,
-            length = obj.length,
-            isArray = isArraylike(obj);
-
-        if (args) {
-            if (isArray) {
-                for (; i < length; i++) {
-                    value = callback.apply(obj[i], args);
-
-                    if (value === false) {
-                        break;
-                    }
-                }
-            } else {
-                for (i in obj) {
-                    value = callback.apply(obj[i], args);
-
-                    if (value === false) {
-                        break;
-                    }
-                }
-            }
-
-        } else {
-            if (isArray) {
-                for (; i < length; i++) {
-                    value = callback.call(obj[i], i, obj[i]);
-
-                    if (value === false) {
-                        break;
-                    }
-                }
-            } else {
-                for (i in obj) {
-                    value = callback.call(obj[i], i, obj[i]);
-
-                    if (value === false) {
-                        break;
-                    }
-                }
-            }
-        }
-
-        return obj;
-    };
-
-    /* Custom */
-    $.data = function (node, key, value) {
-        /* $.getData() */
-        if (value === undefined) {
-            var id = node[$.expando],
-                store = id && cache[id];
-
-            if (key === undefined) {
-                return store;
-            } else if (store) {
-                if (key in store) {
-                    return store[key];
-                }
-            }
-        /* $.setData() */
-        } else if (key !== undefined) {
-            var id = node[$.expando] || (node[$.expando] = ++$.uuid);
-
-            cache[id] = cache[id] || {};
-            cache[id][key] = value;
-
-            return value;
-        }
-    };
-
-    /* Custom */
-    $.removeData = function (node, keys) {
-        var id = node[$.expando],
-            store = id && cache[id];
-
-        if (store) {
-            $.each(keys, function(_, key) {
-                delete store[key];
-            });
-        }
-    };
-
-    /* jQuery */
-    $.extend = function () {
-        var src, copyIsArray, copy, name, options, clone,
-            target = arguments[0] || {},
-            i = 1,
-            length = arguments.length,
-            deep = false;
-
-        if (typeof target === "boolean") {
-            deep = target;
-
-            target = arguments[i] || {};
-            i++;
-        }
-
-        if (typeof target !== "object" && $.type(target) !== "function") {
-            target = {};
-        }
-
-        if (i === length) {
-            target = this;
-            i--;
-        }
-
-        for (; i < length; i++) {
-            if ((options = arguments[i]) != null) {
-                for (name in options) {
-                    src = target[name];
-                    copy = options[name];
-
-                    if (target === copy) {
-                        continue;
-                    }
-
-                    if (deep && copy && ($.isPlainObject(copy) || (copyIsArray = $.isArray(copy)))) {
-                        if (copyIsArray) {
-                            copyIsArray = false;
-                            clone = src && $.isArray(src) ? src : [];
-
-                        } else {
-                            clone = src && $.isPlainObject(src) ? src : {};
-                        }
-
-                        target[name] = $.extend(deep, clone, copy);
-
-                    } else if (copy !== undefined) {
-                        target[name] = copy;
-                    }
-                }
-            }
-        }
-
-        return target;
-    };
-
-    /* jQuery 1.4.3 */
-    $.queue = function (elem, type, data) {
-        function $makeArray (arr, results) {
-            var ret = results || [];
-
-            if (arr != null) {
-                if (isArraylike(Object(arr))) {
-                    /* $.merge */
-                    (function(first, second) {
-                        var len = +second.length,
-                            j = 0,
-                            i = first.length;
-
-                        while (j < len) {
-                            first[i++] = second[j++];
-                        }
-
-                        if (len !== len) {
-                            while (second[j] !== undefined) {
-                                first[i++] = second[j++];
-                            }
-                        }
-
-                        first.length = i;
-
-                        return first;
-                    })(ret, typeof arr === "string" ? [arr] : arr);
-                } else {
-                    [].push.call(ret, arr);
-                }
-            }
-
-            return ret;
-        }
-
-        if (!elem) {
-            return;
-        }
-
-        type = (type || "fx") + "queue";
-
-        var q = $.data(elem, type);
-
-        if (!data) {
-            return q || [];
-        }
-
-        if (!q || $.isArray(data)) {
-            q = $.data(elem, type, $makeArray(data));
-        } else {
-            q.push(data);
-        }
-
-        return q;
-    };
-
-    /* jQuery 1.4.3 */
-    $.dequeue = function (elems, type) {
-        /* Custom: Embed element iteration. */
-        $.each(elems.nodeType ? [ elems ] : elems, function(i, elem) {
-            type = type || "fx";
-
-            var queue = $.queue(elem, type),
-                fn = queue.shift();
-
-            if (fn === "inprogress") {
-                fn = queue.shift();
-            }
-
-            if (fn) {
-                if (type === "fx") {
-                    queue.unshift("inprogress");
-                }
-
-                fn.call(elem, function() {
-                    $.dequeue(elem, type);
-                });
-            }
-        });
-    };
-
-    /******************
-       $.fn Methods
-    ******************/
-
-    /* jQuery */
-    $.fn = $.prototype = {
-        init: function (selector) {
-            /* Just return the element wrapped inside an array; don't proceed with the actual jQuery node wrapping process. */
-            if (selector.nodeType) {
-                this[0] = selector;
-
-                return this;
-            } else {
-                throw new Error("Not a DOM node.");
-            }
-        },
-
-        offset: function () {
-            /* jQuery altered code: Dropped disconnected DOM node checking. */
-            var box = this[0].getBoundingClientRect ? this[0].getBoundingClientRect() : { top: 0, left: 0 };
-
-            return {
-                top: box.top + (window.pageYOffset || document.scrollTop  || 0)  - (document.clientTop  || 0),
-                left: box.left + (window.pageXOffset || document.scrollLeft  || 0) - (document.clientLeft || 0)
-            };
-        },
-
-        position: function () {
-            /* jQuery */
-            function offsetParent() {
-                var offsetParent = this.offsetParent || document;
-
-                while (offsetParent && (!offsetParent.nodeType.toLowerCase === "html" && offsetParent.style.position === "static")) {
-                    offsetParent = offsetParent.offsetParent;
-                }
-
-                return offsetParent || document;
-            }
-
-            /* Zepto */
-            var elem = this[0],
-                offsetParent = offsetParent.apply(elem),
-                offset = this.offset(),
-                parentOffset = /^(?:body|html)$/i.test(offsetParent.nodeName) ? { top: 0, left: 0 } : $(offsetParent).offset()
-
-            offset.top -= parseFloat(elem.style.marginTop) || 0;
-            offset.left -= parseFloat(elem.style.marginLeft) || 0;
-
-            if (offsetParent.style) {
-                parentOffset.top += parseFloat(offsetParent.style.borderTopWidth) || 0
-                parentOffset.left += parseFloat(offsetParent.style.borderLeftWidth) || 0
-            }
-
-            return {
-                top: offset.top - parentOffset.top,
-                left: offset.left - parentOffset.left
-            };
-        }
-    };
-
-    /**********************
-       Private Variables
-    **********************/
-
-    /* For $.data() */
-    var cache = {};
-    $.expando = "velocity" + (new Date().getTime());
-    $.uuid = 0;
-
-    /* For $.queue() */
-    var class2type = {},
-        hasOwn = class2type.hasOwnProperty,
-        toString = class2type.toString;
-
-    var types = "Boolean Number String Function Array Date RegExp Object Error".split(" ");
-    for (var i = 0; i < types.length; i++) {
-        class2type["[object " + types[i] + "]"] = types[i].toLowerCase();
-    }
-
-    /* Makes $(node) possible, without having to call init. */
-    $.fn.init.prototype = $.fn;
-
-    /* Globalize Velocity onto the window, and assign its Utilities property. */
-    window.Velocity = { Utilities: $ };
+/*************************
+   Velocity jQuery Shim
+*************************/
+
+/*! VelocityJS.org jQuery Shim (1.0.1). (C) 2014 The jQuery Foundation. MIT @license: en.wikipedia.org/wiki/MIT_License. */
+
+/* This file contains the jQuery functions that Velocity relies on, thereby removing Velocity's dependency on a full copy of jQuery, and allowing it to work in any environment. */
+/* These shimmed functions are only used if jQuery isn't present. If both this shim and jQuery are loaded, Velocity defaults to jQuery proper. */
+/* Browser support: Using this shim instead of jQuery proper removes support for IE8. */
+
+;(function (window) {
+    /***************
+         Setup
+    ***************/
+
+    /* If jQuery is already loaded, there's no point in loading this shim. */
+    if (window.jQuery) {
+        return;
+    }
+
+    /* jQuery base. */
+    var $ = function (selector, context) {
+        return new $.fn.init(selector, context);
+    };
+
+    /********************
+       Private Methods
+    ********************/
+
+    /* jQuery */
+    $.isWindow = function (obj) {
+        /* jshint eqeqeq: false */
+        return obj != null && obj == obj.window;
+    };
+
+    /* jQuery */
+    $.type = function (obj) {
+        if (obj == null) {
+            return obj + "";
+        }
+
+        return typeof obj === "object" || typeof obj === "function" ?
+            class2type[toString.call(obj)] || "object" :
+            typeof obj;
+    };
+
+    /* jQuery */
+    $.isArray = Array.isArray || function (obj) {
+        return $.type(obj) === "array";
+    };
+
+    /* jQuery */
+    function isArraylike (obj) {
+        var length = obj.length,
+            type = $.type(obj);
+
+        if (type === "function" || $.isWindow(obj)) {
+            return false;
+        }
+
+        if (obj.nodeType === 1 && length) {
+            return true;
+        }
+
+        return type === "array" || length === 0 || typeof length === "number" && length > 0 && (length - 1) in obj;
+    }
+
+    /***************
+       $ Methods
+    ***************/
+
+    /* jQuery: Support removed for IE<9. */
+    $.isPlainObject = function (obj) {
+        var key;
+
+        if (!obj || $.type(obj) !== "object" || obj.nodeType || $.isWindow(obj)) {
+            return false;
+        }
+
+        try {
+            if (obj.constructor &&
+                !hasOwn.call(obj, "constructor") &&
+                !hasOwn.call(obj.constructor.prototype, "isPrototypeOf")) {
+                return false;
+            }
+        } catch (e) {
+            return false;
+        }
+
+        for (key in obj) {}
+
+        return key === undefined || hasOwn.call(obj, key);
+    };
+
+    /* jQuery */
+    $.each = function(obj, callback, args) {
+        var value,
+            i = 0,
+            length = obj.length,
+            isArray = isArraylike(obj);
+
+        if (args) {
+            if (isArray) {
+                for (; i < length; i++) {
+                    value = callback.apply(obj[i], args);
+
+                    if (value === false) {
+                        break;
+                    }
+                }
+            } else {
+                for (i in obj) {
+                    value = callback.apply(obj[i], args);
+
+                    if (value === false) {
+                        break;
+                    }
+                }
+            }
+
+        } else {
+            if (isArray) {
+                for (; i < length; i++) {
+                    value = callback.call(obj[i], i, obj[i]);
+
+                    if (value === false) {
+                        break;
+                    }
+                }
+            } else {
+                for (i in obj) {
+                    value = callback.call(obj[i], i, obj[i]);
+
+                    if (value === false) {
+                        break;
+                    }
+                }
+            }
+        }
+
+        return obj;
+    };
+
+    /* Custom */
+    $.data = function (node, key, value) {
+        /* $.getData() */
+        if (value === undefined) {
+            var id = node[$.expando],
+                store = id && cache[id];
+
+            if (key === undefined) {
+                return store;
+            } else if (store) {
+                if (key in store) {
+                    return store[key];
+                }
+            }
+        /* $.setData() */
+        } else if (key !== undefined) {
+            var id = node[$.expando] || (node[$.expando] = ++$.uuid);
+
+            cache[id] = cache[id] || {};
+            cache[id][key] = value;
+
+            return value;
+        }
+    };
+
+    /* Custom */
+    $.removeData = function (node, keys) {
+        var id = node[$.expando],
+            store = id && cache[id];
+
+        if (store) {
+            $.each(keys, function(_, key) {
+                delete store[key];
+            });
+        }
+    };
+
+    /* jQuery */
+    $.extend = function () {
+        var src, copyIsArray, copy, name, options, clone,
+            target = arguments[0] || {},
+            i = 1,
+            length = arguments.length,
+            deep = false;
+
+        if (typeof target === "boolean") {
+            deep = target;
+
+            target = arguments[i] || {};
+            i++;
+        }
+
+        if (typeof target !== "object" && $.type(target) !== "function") {
+            target = {};
+        }
+
+        if (i === length) {
+            target = this;
+            i--;
+        }
+
+        for (; i < length; i++) {
+            if ((options = arguments[i]) != null) {
+                for (name in options) {
+                    src = target[name];
+                    copy = options[name];
+
+                    if (target === copy) {
+                        continue;
+                    }
+
+                    if (deep && copy && ($.isPlainObject(copy) || (copyIsArray = $.isArray(copy)))) {
+                        if (copyIsArray) {
+                            copyIsArray = false;
+                            clone = src && $.isArray(src) ? src : [];
+
+                        } else {
+                            clone = src && $.isPlainObject(src) ? src : {};
+                        }
+
+                        target[name] = $.extend(deep, clone, copy);
+
+                    } else if (copy !== undefined) {
+                        target[name] = copy;
+                    }
+                }
+            }
+        }
+
+        return target;
+    };
+
+    /* jQuery 1.4.3 */
+    $.queue = function (elem, type, data) {
+        function $makeArray (arr, results) {
+            var ret = results || [];
+
+            if (arr != null) {
+                if (isArraylike(Object(arr))) {
+                    /* $.merge */
+                    (function(first, second) {
+                        var len = +second.length,
+                            j = 0,
+                            i = first.length;
+
+                        while (j < len) {
+                            first[i++] = second[j++];
+                        }
+
+                        if (len !== len) {
+                            while (second[j] !== undefined) {
+                                first[i++] = second[j++];
+                            }
+                        }
+
+                        first.length = i;
+
+                        return first;
+                    })(ret, typeof arr === "string" ? [arr] : arr);
+                } else {
+                    [].push.call(ret, arr);
+                }
+            }
+
+            return ret;
+        }
+
+        if (!elem) {
+            return;
+        }
+
+        type = (type || "fx") + "queue";
+
+        var q = $.data(elem, type);
+
+        if (!data) {
+            return q || [];
+        }
+
+        if (!q || $.isArray(data)) {
+            q = $.data(elem, type, $makeArray(data));
+        } else {
+            q.push(data);
+        }
+
+        return q;
+    };
+
+    /* jQuery 1.4.3 */
+    $.dequeue = function (elems, type) {
+        /* Custom: Embed element iteration. */
+        $.each(elems.nodeType ? [ elems ] : elems, function(i, elem) {
+            type = type || "fx";
+
+            var queue = $.queue(elem, type),
+                fn = queue.shift();
+
+            if (fn === "inprogress") {
+                fn = queue.shift();
+            }
+
+            if (fn) {
+                if (type === "fx") {
+                    queue.unshift("inprogress");
+                }
+
+                fn.call(elem, function() {
+                    $.dequeue(elem, type);
+                });
+            }
+        });
+    };
+
+    /******************
+       $.fn Methods
+    ******************/
+
+    /* jQuery */
+    $.fn = $.prototype = {
+        init: function (selector) {
+            /* Just return the element wrapped inside an array; don't proceed with the actual jQuery node wrapping process. */
+            if (selector.nodeType) {
+                this[0] = selector;
+
+                return this;
+            } else {
+                throw new Error("Not a DOM node.");
+            }
+        },
+
+        offset: function () {
+            /* jQuery altered code: Dropped disconnected DOM node checking. */
+            var box = this[0].getBoundingClientRect ? this[0].getBoundingClientRect() : { top: 0, left: 0 };
+
+            return {
+                top: box.top + (window.pageYOffset || document.scrollTop  || 0)  - (document.clientTop  || 0),
+                left: box.left + (window.pageXOffset || document.scrollLeft  || 0) - (document.clientLeft || 0)
+            };
+        },
+
+        position: function () {
+            /* jQuery */
+            function offsetParent() {
+                var offsetParent = this.offsetParent || document;
+
+                while (offsetParent && (!offsetParent.nodeType.toLowerCase === "html" && offsetParent.style.position === "static")) {
+                    offsetParent = offsetParent.offsetParent;
+                }
+
+                return offsetParent || document;
+            }
+
+            /* Zepto */
+            var elem = this[0],
+                offsetParent = offsetParent.apply(elem),
+                offset = this.offset(),
+                parentOffset = /^(?:body|html)$/i.test(offsetParent.nodeName) ? { top: 0, left: 0 } : $(offsetParent).offset()
+
+            offset.top -= parseFloat(elem.style.marginTop) || 0;
+            offset.left -= parseFloat(elem.style.marginLeft) || 0;
+
+            if (offsetParent.style) {
+                parentOffset.top += parseFloat(offsetParent.style.borderTopWidth) || 0
+                parentOffset.left += parseFloat(offsetParent.style.borderLeftWidth) || 0
+            }
+
+            return {
+                top: offset.top - parentOffset.top,
+                left: offset.left - parentOffset.left
+            };
+        }
+    };
+
+    /**********************
+       Private Variables
+    **********************/
+
+    /* For $.data() */
+    var cache = {};
+    $.expando = "velocity" + (new Date().getTime());
+    $.uuid = 0;
+
+    /* For $.queue() */
+    var class2type = {},
+        hasOwn = class2type.hasOwnProperty,
+        toString = class2type.toString;
+
+    var types = "Boolean Number String Function Array Date RegExp Object Error".split(" ");
+    for (var i = 0; i < types.length; i++) {
+        class2type["[object " + types[i] + "]"] = types[i].toLowerCase();
+    }
+
+    /* Makes $(node) possible, without having to call init. */
+    $.fn.init.prototype = $.fn;
+
+    /* Globalize Velocity onto the window, and assign its Utilities property. */
+    window.Velocity = { Utilities: $ };
 })(window);
 
 /******************
@@ -2074,7 +2074,7 @@ return function (global, window, document, undefined) {
         /* Support is included for jQuery's argument overloading: $.animate(propertyMap [, duration] [, easing] [, complete]).
            Overloading is detected by checking for the absence of an object being passed into options. */
         /* Note: The stop and finish actions do not accept animation options, and are therefore excluded from this check. */
-        if (!/^(stop|finish)$/i.test(propertiesMap) && !$.isPlainObject(options)) {
+        if (!/^(stop|finish|finishAll)$/i.test(propertiesMap) && !$.isPlainObject(options)) {
             /* The utility function shifts all arguments one position to the right, so we adjust for that offset. */
             var startingArgumentPosition = argumentIndex + 1;
 
@@ -2140,6 +2140,7 @@ return function (global, window, document, undefined) {
                 break;
 
             case "finish":
+            case "finishAll":
             case "stop":
                 /*******************
                     Action: Stop
@@ -2158,6 +2159,22 @@ return function (global, window, document, undefined) {
 
                         delete Data(element).delayTimer;
                     }
+
+                    /* If we want to finish everything in the queue, we have to iterate through it
+                       and call each function. This will make them active calls below, which will
+                       cause them to be applied via the duration setting. */
+                    if (propertiesMap === "finishAll" && (options === true || Type.isString(options))) {
+                        /* Iterate through the items in the element's queue. */
+                        $.each($.queue(element, Type.isString(options) ? options : ""), function(_, item) {
+                            /* The queue array can contain an "inprogress" string, which we skip. */
+                            if (Type.isFunction(item)) {
+                                item();                                                    
+                            }
+                        });
+
+                        /* Clearing the $.queue() array is achieved by resetting it to []. */
+                        $.queue(element, Type.isString(options) ? options : "", []);
+                    }
                 });
 
                 var callsToStop = [];
@@ -2193,7 +2210,8 @@ return function (global, window, document, undefined) {
                             $.each(elements, function(l, element) {                                
                                 /* Check that this call was applied to the target element. */
                                 if (element === activeElement) {
-                                    /* Optionally clear the remaining queued calls. */
+                                    /* Optionally clear the remaining queued calls. If we're doing "finishAll" this won't find anything,
+                                       due to the queue-clearing above. */
                                     if (options === true || Type.isString(options)) {
                                         /* Iterate through the items in the element's queue. */
                                         $.each($.queue(element, Type.isString(options) ? options : ""), function(_, item) {
@@ -2221,7 +2239,7 @@ return function (global, window, document, undefined) {
                                         }
 
                                         callsToStop.push(i);
-                                    } else if (propertiesMap === "finish") {
+                                    } else if (propertiesMap === "finish" || propertiesMap === "finishAll") {
                                         /* To get active tweens to finish immediately, we forcefully shorten their durations to 1ms so that
                                         they finish upon the next rAf tick then proceed with normal call completion logic. */
                                         activeCall[2].duration = 1;