Skip to content

Commit

Permalink
fix: reject promise when calling 'load' instead of 'inject'
Browse files Browse the repository at this point in the history
Fixes #147
  • Loading branch information
ocombe committed May 29, 2015
1 parent 499bd72 commit 3159547
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 10 deletions.
8 changes: 7 additions & 1 deletion dist/modules/ocLazyLoad.loaders.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,13 @@
promises.push(jsDeferred.promise);
}

if (params.serie && params.files.length > 0) {
if (promises.length === 0) {
var deferred = $q.defer(),
err = "Error: no file to load has been found, if you're trying to load an existing module you should use the 'inject' method instead of 'load'.";
$delegate._$log.error(err);
deferred.reject(err);
return deferred.promise;
} else if (params.serie && params.files.length > 0) {
return $q.all(promises).then(function () {
return $delegate.filesLoader(config, params);
});
Expand Down
8 changes: 7 additions & 1 deletion dist/ocLazyLoad.js

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

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.min.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion dist/ocLazyLoad.require.js

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

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.require.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.require.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/ocLazyLoad.require.min.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion src/ocLazyLoad.loaders.core.js
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@
promises.push(jsDeferred.promise);
}

if(params.serie && params.files.length > 0) {
if(promises.length === 0) {
let deferred = $q.defer(),
err = "Error: no file to load has been found, if you're trying to load an existing module you should use the 'inject' method instead of 'load'.";
$delegate._$log.error(err);
deferred.reject(err);
return deferred.promise;
} else if(params.serie && params.files.length > 0) {
return $q.all(promises).then(() => $delegate.filesLoader(config, params));
} else {
return $q.all(promises).finally(res => {
Expand Down

0 comments on commit 3159547

Please # to comment.