Skip to content

Commit

Permalink
minimumTime is functional again.
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaya committed Dec 5, 2013
1 parent ceeb235 commit 6bbcd07
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,6 @@ module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-remove-logging");

//register the task
grunt.registerTask('default', ['concat', 'removelogging', 'uglify']);
grunt.registerTask('build', ['concat', 'removelogging', 'uglify']);
grunt.registerTask('dev-watching', ['concat:dist']);
};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "QueryLoader2",
"version": "2.8",
"version": "2.8.2",
"homepage": "http://www.gayadesign.com/diy/queryloader2-preload-your-images-with-ease/",
"authors": [
"Gaya <[email protected]>"
Expand Down
6 changes: 3 additions & 3 deletions jquery.queryloader2.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
* Licensed under the MIT license:
* http://www.opensource.org/licenses/mit-license.php
*
* Version: 2.8.1
* Last update: 2013-11-21
* Version: 2.8.2
* Last update: 2013-12-05
*/
(function($){function OverlayLoader(parent) {
this.parent = parent;
Expand Down Expand Up @@ -332,7 +332,7 @@ QueryLoader2.prototype.endLoader = function () {

QueryLoader2.prototype.onLoadComplete = function() {
if (this.options.completeAnimation == "grow") {
var animationTime = 500;
var animationTime = this.options.minimumTime;

this.overlayLoader.loadbar[0].parent = this; //put object in DOM element
this.overlayLoader.loadbar.stop().animate({
Expand Down
6 changes: 3 additions & 3 deletions jquery.queryloader2.min.js

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jquery.queryloader2",
"version": "2.8.1",
"version": "2.8.2",
"devDependencies": {
"grunt": "~0.4.1",
"grunt-contrib-uglify": "~0.2.2",
Expand Down
2 changes: 1 addition & 1 deletion src/QueryLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ QueryLoader2.prototype.endLoader = function () {

QueryLoader2.prototype.onLoadComplete = function() {
if (this.options.completeAnimation == "grow") {
var animationTime = 500;
var animationTime = this.options.minimumTime;

this.overlayLoader.loadbar[0].parent = this; //put object in DOM element
this.overlayLoader.loadbar.stop().animate({
Expand Down

0 comments on commit 6bbcd07

Please sign in to comment.