Skip to content

Commit f2e3261

Browse files
committed
fixes #49, fixes #45
1 parent f5e4275 commit f2e3261

File tree

6 files changed

+28
-44
lines changed

6 files changed

+28
-44
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ Only the values you'd like overriden need to be specified.
9191

9292

9393
## Release History
94+
* v4.1.3 - Fix for issue #45 and issue #49.
9495
* v4.1.2 - Small bugs fixed, wrapperClass option added.
9596
* v4.1.1 - Compatibility with Angular 1.3.
9697
* v4.1.0

angular-busy.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi
104104
//we don't want to initiate the min duration if the
105105
//promise finished before the delay was complete
106106
tracker.delayJustFinished = false;
107+
if (tracker.promises.length === 0) {
108+
tracker.durationPromise = null;
109+
}
107110
return tracker.promises.length > 0;
108111
}
109112
};

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-busy",
3-
"version": "4.1.2",
3+
"version": "4.1.3",
44
"main": [
55
"dist/angular-busy.js",
66
"dist/angular-busy.css"

dist/angular-busy.js

Lines changed: 21 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,9 @@ angular.module('cgBusy').factory('_cgBusyTrackerFactory',['$timeout','$q',functi
104104
//we don't want to initiate the min duration if the
105105
//promise finished before the delay was complete
106106
tracker.delayJustFinished = false;
107+
if (tracker.promises.length === 0) {
108+
tracker.durationPromise = null;
109+
}
107110
return tracker.promises.length > 0;
108111
}
109112
};
@@ -244,51 +247,28 @@ angular.module('cgBusy').run(['$templateCache', function($templateCache) {
244247
'use strict';
245248

246249
$templateCache.put('angular-busy.html',
247-
"<div class=\"cg-busy-default-wrapper\">\r" +
248-
"\n" +
249-
"\r" +
250-
"\n" +
251-
" <div class=\"cg-busy-default-sign\">\r" +
252-
"\n" +
253-
"\r" +
254-
"\n" +
255-
" <div class=\"cg-busy-default-spinner\">\r" +
256-
"\n" +
257-
" <div class=\"bar1\"></div>\r" +
258-
"\n" +
259-
" <div class=\"bar2\"></div>\r" +
260-
"\n" +
261-
" <div class=\"bar3\"></div>\r" +
262-
"\n" +
263-
" <div class=\"bar4\"></div>\r" +
264-
"\n" +
265-
" <div class=\"bar5\"></div>\r" +
266-
"\n" +
267-
" <div class=\"bar6\"></div>\r" +
268-
"\n" +
269-
" <div class=\"bar7\"></div>\r" +
270-
"\n" +
271-
" <div class=\"bar8\"></div>\r" +
272-
"\n" +
273-
" <div class=\"bar9\"></div>\r" +
274-
"\n" +
275-
" <div class=\"bar10\"></div>\r" +
276-
"\n" +
277-
" <div class=\"bar11\"></div>\r" +
278-
"\n" +
279-
" <div class=\"bar12\"></div>\r" +
280-
"\n" +
281-
" </div>\r" +
282-
"\n" +
283-
"\r" +
250+
"<div class=\"cg-busy-default-wrapper\">\n" +
284251
"\n" +
285-
" <div class=\"cg-busy-default-text\">{{$message}}</div>\r" +
252+
" <div class=\"cg-busy-default-sign\">\n" +
286253
"\n" +
287-
"\r" +
254+
" <div class=\"cg-busy-default-spinner\">\n" +
255+
" <div class=\"bar1\"></div>\n" +
256+
" <div class=\"bar2\"></div>\n" +
257+
" <div class=\"bar3\"></div>\n" +
258+
" <div class=\"bar4\"></div>\n" +
259+
" <div class=\"bar5\"></div>\n" +
260+
" <div class=\"bar6\"></div>\n" +
261+
" <div class=\"bar7\"></div>\n" +
262+
" <div class=\"bar8\"></div>\n" +
263+
" <div class=\"bar9\"></div>\n" +
264+
" <div class=\"bar10\"></div>\n" +
265+
" <div class=\"bar11\"></div>\n" +
266+
" <div class=\"bar12\"></div>\n" +
267+
" </div>\n" +
288268
"\n" +
289-
" </div>\r" +
269+
" <div class=\"cg-busy-default-text\">{{$message}}</div>\n" +
290270
"\n" +
291-
"\r" +
271+
" </div>\n" +
292272
"\n" +
293273
"</div>"
294274
);

dist/angular-busy.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "angular-busy",
33
"main": "angular-busy.js",
4-
"version": "4.1.2",
4+
"version": "4.1.3",
55
"description": "",
66
"repository": {
77
"type": "git",

0 commit comments

Comments
 (0)