Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'dev-master' into dev-3.x
Conflicts:
	build/loader-base/loader-base-coverage.js
	build/loader-base/loader-base-min.js
	build/loader-pathogen-encoder/loader-pathogen-encoder-min.js
	build/loader/loader-min.js
	build/yui-nodejs/yui-nodejs-min.js
	build/yui/yui-min.js
  • Loading branch information
tripp committed Sep 26, 2014
2 parents 2c95138 + 954cf42 commit 205f1e9
Show file tree
Hide file tree
Showing 17 changed files with 21 additions and 21 deletions.
4 changes: 2 additions & 2 deletions build/loader-base/loader-base-coverage.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader-base/loader-base-debug.js
Expand Up @@ -2155,7 +2155,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
4 changes: 2 additions & 2 deletions build/loader-base/loader-base-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader-base/loader-base.js
Expand Up @@ -2134,7 +2134,7 @@ Y.Loader.prototype = {
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
Expand Up @@ -2155,7 +2155,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
4 changes: 2 additions & 2 deletions build/loader-pathogen-encoder/loader-pathogen-encoder-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader-pathogen-encoder/loader-pathogen-encoder.js
Expand Up @@ -2134,7 +2134,7 @@ Y.Loader.prototype = {
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/loader/loader-debug.js
Expand Up @@ -2155,7 +2155,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
4 changes: 2 additions & 2 deletions build/loader/loader-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/loader/loader.js
Expand Up @@ -2134,7 +2134,7 @@ Y.Loader.prototype = {
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/yui-nodejs/yui-nodejs-debug.js
Expand Up @@ -7410,7 +7410,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/yui-nodejs/yui-nodejs-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/yui-nodejs/yui-nodejs.js
Expand Up @@ -7131,7 +7131,7 @@ Y.Loader.prototype = {
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/yui/yui-debug.js
Expand Up @@ -8420,7 +8420,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion build/yui/yui-min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion build/yui/yui.js
Expand Up @@ -8134,7 +8134,7 @@ Y.Loader.prototype = {
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/loader/js/loader.js
Expand Up @@ -2043,7 +2043,7 @@ Y.log('Undefined module: ' + mname + ', matched a pattern: ' +
test: void 0,
temp: true
}), mname);
if (found.configFn) {
if (m && found.configFn) {
m.configFn = found.configFn;
}
}
Expand Down

0 comments on commit 205f1e9

Please sign in to comment.