Skip to content

Commit

Permalink
Merging/building finishAll & versions bump
Browse files Browse the repository at this point in the history
  • Loading branch information
kenwheeler committed Sep 26, 2015
1 parent d9cd60b commit f28c610
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 23 deletions.
26 changes: 13 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
##Velocity 1.2.2
##Velocity 1.2.3

**News**
**News**
You can now order the Velocity book on [Amazon](http://amazon.com/Web-Animation-using-JavaScript-Develop/dp/0134096665)!

WhatsApp, Tumblr, Windows, Samsung, Uber, and thousands of other companies rely on Velocity. Visit [Libscore.com](http://libscore.com/#$.Velocity) to see which sites use Velocity on their homepage.

Also, a round of Velocity updates are coming shortly, including an official React plugin :)

**Docs**
**Docs**
[VelocityJS.org](http://VelocityJS.org)

**Quickstart**
**Quickstart**

Velocity (CDN):
`<script src="//cdn.jsdelivr.net/velocity/1.2.2/velocity.min.js"></script>`
Velocity (CDN):
`<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.min.js"></script>`

Velocity UI pack (CDN):
`<script src="//cdn.jsdelivr.net/velocity/1.2.2/velocity.ui.min.js"></script>`
Velocity UI pack (CDN):
`<script src="//cdn.jsdelivr.net/velocity/1.2.3/velocity.ui.min.js"></script>`

Package managers:
`bower install velocity`
`npm install velocity-animate`
Package managers:
`bower install velocity`
`npm install velocity-animate`

**Found a Possible Bug?**

Expand All @@ -33,7 +33,7 @@ Ask on [StackOverflow](http://stackoverflow.com/tags/velocity.js) (make sure you
###**Updates**

- **1.2.0**: [Custom tweens](http://VelocityJS.org/#progress). [Custom easings](http://VelocityJS.org/#easing). ["Finish" command](http://VelocityJS.org/#finish). See [commit log](https://github.com/julianshapiro/velocity/commit/2a28e3812c6fe9262244ed3b6d41d12ae9a107c6) for more.
- **1.0.0**: File name changed to `velocity.js`. Read [VelocityJS.org/#dependencies](http://VelocityJS.org/#dependencies).
- **1.0.0**: File name changed to `velocity.js`. Read [VelocityJS.org/#dependencies](http://VelocityJS.org/#dependencies).
- **0.1.0**: `stop` now stops animations *immediately* (instead of only clearing the remainder of the animation queue). No other backwards-incompatible changes were made.

###**Learn**
Expand All @@ -51,5 +51,5 @@ Ask on [StackOverflow](http://stackoverflow.com/tags/velocity.js) (make sure you

====

[MIT License](LICENSE.md). © Julian Shapiro (http://twitter.com/shapiro).
[MIT License](LICENSE.md). © Julian Shapiro (http://twitter.com/shapiro).
[Stripe](https://stripe.com/blog/stripe-open-source-retreat) sponsors Velocity's development. [BrowserStack](http://www.browserstack.com/) provides testing services.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "velocity",
"version": "1.2.2",
"version": "1.2.3",
"homepage": "http://velocityjs.org",
"authors": [
{ "name" : "Julian Shapiro",
Expand Down Expand Up @@ -31,7 +31,7 @@
"jquery": "*"
},
"repository" :
{
{
"type" : "git",
"url" : "http://github.com/julianshapiro/velocity.git"
}
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "velocity-animate",
"version": "1.2.2",
"version": "1.2.3",
"description": "Accelerated JavaScript animation.",
"keywords": [
"velocity",
Expand Down
8 changes: 4 additions & 4 deletions velocity.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*! VelocityJS.org (1.2.2). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */
/*! VelocityJS.org (1.2.3). (C) 2014 Julian Shapiro. MIT @license: en.wikipedia.org/wiki/MIT_License */

/*************************
Velocity jQuery Shim
Expand Down Expand Up @@ -2168,7 +2168,7 @@ return function (global, window, document, undefined) {
$.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();
item();
}
});

Expand Down Expand Up @@ -2207,7 +2207,7 @@ return function (global, window, document, undefined) {
}

/* Iterate through the calls targeted by the stop command. */
$.each(elements, function(l, element) {
$.each(elements, function(l, element) {
/* Check that this call was applied to the target element. */
if (element === activeElement) {
/* Optionally clear the remaining queued calls. If we're doing "finishAll" this won't find anything,
Expand Down Expand Up @@ -3491,7 +3491,7 @@ return function (global, window, document, undefined) {
tween.currentValue = currentValue;

/* If we're tweening a fake 'tween' property in order to log transition values, update the one-per-call variable so that
it can be passed into the progress callback. */
it can be passed into the progress callback. */
if (property === "tween") {
tweenDummyValue = currentValue;
} else {
Expand Down
6 changes: 3 additions & 3 deletions velocity.min.js

Large diffs are not rendered by default.

0 comments on commit f28c610

Please sign in to comment.