Skip to content

Commit 410340e

Browse files
committed
feature(bower) load v1.1.3
1 parent d4d53a6 commit 410340e

File tree

5 files changed

+25
-11
lines changed

5 files changed

+25
-11
lines changed

modules/load/.bower.json

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "load",
33
"main": "load.js",
4-
"version": "1.1.2",
4+
"version": "1.1.3",
55
"description": "Dynamically loading external JavaScript and CSS files",
66
"homepage": "https://github.com/coderaiser/load.js",
77
"authors": [
@@ -13,14 +13,16 @@
1313
"keywords": [
1414
"load"
1515
],
16+
"ignore": [],
1617
"license": "MIT",
17-
"_release": "1.1.2",
18+
"_release": "1.1.3",
1819
"_resolution": {
1920
"type": "version",
20-
"tag": "v1.1.2",
21-
"commit": "967bd65c6b5af21da3d85ea4a2144014a28eee39"
21+
"tag": "v1.1.3",
22+
"commit": "a888f78f5634e8b93b98863d51ab530957413fbc"
2223
},
2324
"_source": "git://github.com/coderaiser/load.js.git",
24-
"_target": "~1.1.0",
25-
"_originalSource": "load"
25+
"_target": "~1.1.3",
26+
"_originalSource": "load",
27+
"_direct": true
2628
}

modules/load/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
npm-debug.log

modules/load/ChangeLog

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
2015.01.15, v1.1.3
2+
3+
fix:
4+
- (load) parallel: add done
5+
6+
feature:
7+
- (bower) add ignore
8+
- (gitignore) add
9+
10+
111
2015.01.13, v1.1.2
212

313
feature:

modules/load/bower.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "load",
33
"main": "load.js",
4-
"version": "1.1.2",
4+
"version": "1.1.3",
55
"description": "Dynamically loading external JavaScript and CSS files",
66
"homepage": "https://github.com/coderaiser/load.js",
77
"authors": [
@@ -13,5 +13,6 @@
1313
"keywords": [
1414
"load"
1515
],
16+
"ignore": [],
1617
"license": "MIT"
1718
}

modules/load/load.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,14 +118,14 @@
118118

119119
load.parallel = function(urls, callback) {
120120
var i = urls.length,
121+
done,
121122
func = function(error) {
122123
--i;
123124

124-
if (error)
125-
i = 0;
126-
127-
if (!i)
125+
if (!i && !done || error) {
126+
done = true;
128127
callback(error);
128+
}
129129
};
130130

131131
urls.forEach(function(url) {

0 commit comments

Comments
 (0)