Skip to content

Commit

Permalink
fixes #49, fixes #45
Browse files Browse the repository at this point in the history
  • Loading branch information
cgross committed Apr 12, 2015
1 parent f5e4275 commit f2e3261
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 44 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ Only the values you'd like overriden need to be specified.


## Release History
* v4.1.3 - Fix for issue #45 and issue #49.
* v4.1.2 - Small bugs fixed, wrapperClass option added.
* v4.1.1 - Compatibility with Angular 1.3.
* v4.1.0
Expand Down
3 changes: 3 additions & 0 deletions angular-busy.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi
//we don't want to initiate the min duration if the
//promise finished before the delay was complete
tracker.delayJustFinished = false;
if (tracker.promises.length === 0) {
tracker.durationPromise = null;
}
return tracker.promises.length > 0;
}
};
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "angular-busy",
"version": "4.1.2",
"version": "4.1.3",
"main": [
"dist/angular-busy.js",
"dist/angular-busy.css"
Expand Down
62 changes: 21 additions & 41 deletions dist/angular-busy.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi
//we don't want to initiate the min duration if the
//promise finished before the delay was complete
tracker.delayJustFinished = false;
if (tracker.promises.length === 0) {
tracker.durationPromise = null;
}
return tracker.promises.length > 0;
}
};
Expand Down Expand Up @@ -244,51 +247,28 @@ angular.module('cgBusy').run(['$templateCache', function($templateCache) {
'use strict';

$templateCache.put('angular-busy.html',
"<div class=\"cg-busy-default-wrapper\">\r" +
"\n" +
"\r" +
"\n" +
" <div class=\"cg-busy-default-sign\">\r" +
"\n" +
"\r" +
"\n" +
" <div class=\"cg-busy-default-spinner\">\r" +
"\n" +
" <div class=\"bar1\"></div>\r" +
"\n" +
" <div class=\"bar2\"></div>\r" +
"\n" +
" <div class=\"bar3\"></div>\r" +
"\n" +
" <div class=\"bar4\"></div>\r" +
"\n" +
" <div class=\"bar5\"></div>\r" +
"\n" +
" <div class=\"bar6\"></div>\r" +
"\n" +
" <div class=\"bar7\"></div>\r" +
"\n" +
" <div class=\"bar8\"></div>\r" +
"\n" +
" <div class=\"bar9\"></div>\r" +
"\n" +
" <div class=\"bar10\"></div>\r" +
"\n" +
" <div class=\"bar11\"></div>\r" +
"\n" +
" <div class=\"bar12\"></div>\r" +
"\n" +
" </div>\r" +
"\n" +
"\r" +
"<div class=\"cg-busy-default-wrapper\">\n" +
"\n" +
" <div class=\"cg-busy-default-text\">{{$message}}</div>\r" +
" <div class=\"cg-busy-default-sign\">\n" +
"\n" +
"\r" +
" <div class=\"cg-busy-default-spinner\">\n" +
" <div class=\"bar1\"></div>\n" +
" <div class=\"bar2\"></div>\n" +
" <div class=\"bar3\"></div>\n" +
" <div class=\"bar4\"></div>\n" +
" <div class=\"bar5\"></div>\n" +
" <div class=\"bar6\"></div>\n" +
" <div class=\"bar7\"></div>\n" +
" <div class=\"bar8\"></div>\n" +
" <div class=\"bar9\"></div>\n" +
" <div class=\"bar10\"></div>\n" +
" <div class=\"bar11\"></div>\n" +
" <div class=\"bar12\"></div>\n" +
" </div>\n" +
"\n" +
" </div>\r" +
" <div class=\"cg-busy-default-text\">{{$message}}</div>\n" +
"\n" +
"\r" +
" </div>\n" +
"\n" +
"</div>"
);
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-busy.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,7 +1,7 @@
{
"name": "angular-busy",
"main": "angular-busy.js",
"version": "4.1.2",
"version": "4.1.3",
"description": "",
"repository": {
"type": "git",
Expand Down

0 comments on commit f2e3261

Please sign in to comment.