Skip to content

Commit

Permalink
Update easing function declaration. Bump the next version.
Browse files Browse the repository at this point in the history
Easing function had obsolete declaration with 5 arguments, should be only 1.
  • Loading branch information
kottenator committed Apr 23, 2017
1 parent effee69 commit 895a8ac
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 16 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-circle-progress",
"version": "1.2.1",
"version": "1.2.2",
"authors": [
"Rostyslav Bryzgunov <[email protected]>"
],
Expand Down
14 changes: 9 additions & 5 deletions dist/circle-progress.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* {@link http://kottenator.github.io/jquery-circle-progress/}
*
* @author Rostyslav Bryzgunov <[email protected]>
* @version 1.2.1
* @version 1.2.2
* @licence MIT
* @preserve
*/
Expand Down Expand Up @@ -470,10 +470,14 @@
};

// ease-in-out-cubic
$.easing.circleProgressEasing = function(x, t, b, c, d) {
if ((t /= d / 2) < 1)
return c / 2 * t * t * t + b;
return c / 2 * ((t -= 2) * t * t + 2) + b;
$.easing.circleProgressEasing = function(x) {
if (x < 0.5) {
x = 2 * x;
return 0.5 * x * x * x;
} else {
x = 2 - 2 * x;
return 1 - 0.5 * x * x * x;
}
};

/**
Expand Down
4 changes: 2 additions & 2 deletions dist/circle-progress.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 5 additions & 7 deletions docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,10 @@ <h1 class="page-title">
read the documentation on <a href="https://github.com/kottenator/jquery-circle-progress">GitHub</a>
</p>

<p>
<div class="install">
<a href="https://github.com/kottenator/jquery-circle-progress/archive/1.2.1.tar.gz">Download version 1.2.1</a>
<code>bower install jquery-circle-progress</code>
<code>npm install jquery-circle-progress</code>
</div>
<p class="install">
<a href="https://github.com/kottenator/jquery-circle-progress/archive/1.2.2.tar.gz">Download version 1.2.2</a>
<code>bower install jquery-circle-progress</code>
<code>npm install jquery-circle-progress</code>
</p>

<p class="credits">
Expand All @@ -74,7 +72,7 @@ <h1 class="page-title">
</p>

<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.0/jquery.min.js"></script>
<script src="https://rawgit.com/kottenator/jquery-circle-progress/1.2.1/dist/circle-progress.js"></script>
<script src="https://rawgit.com/kottenator/jquery-circle-progress/1.2.2/dist/circle-progress.js"></script>
<script src="examples.js"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery-circle-progress",
"version": "1.2.1",
"version": "1.2.2",
"author": "Rostyslav Bryzgunov <[email protected]>",
"description": "Plugin to draw animated circular progress bars",
"license": "MIT",
Expand Down

0 comments on commit 895a8ac

Please sign in to comment.