Skip to content

Commit

Permalink
chore: bump to 1.0.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@ocombe
ocombe committed Nov 2, 2015
1 parent 1113094 commit 47f59c8
Show file tree
Hide file tree
Showing 10 changed files with 39 additions and 19 deletions.
14 changes: 14 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
<a name="1.0.7"></a>
# 1.0.7 (2015-11-02)


## Bug Fixes

- requirejs error callback
([11130942](https://github.com/ocombe/ocLazyLoad/commit/11130942ab3dbed497a64ab7eac5175e9b3597c4))
- infinite loop in inject
([70859980](https://github.com/ocombe/ocLazyLoad/commit/70859980d0537780c46e5a096d8c3c9cff86de83))
- IE "Invalid calling object" error (attach to DOM and then compile)
([d99ab925](https://github.com/ocombe/ocLazyLoad/commit/d99ab92533ef4bdfa334926307af9f32097592a3))


<a name="1.0.6"></a>
# 1.0.6 (2015-10-01)

Expand Down
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "oclazyload",
"version": "1.0.6",
"version": "1.0.7",
"description": "Load modules on demand (lazy load) with angularJS",
"main": "dist/ocLazyLoad.js",
"homepage": "https://github.com/ocombe/ocLazyLoad",
Expand Down
2 changes: 1 addition & 1 deletion dist/modules/ocLazyLoad.core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -622,7 +622,7 @@
if (angular.isArray(moduleName)) {
var promisesList = [];
angular.forEach(moduleName, function (module) {
promisesList.push(self.inject(moduleName, localParams, real));
promisesList.push(self.inject(module, localParams, real));
});
return $q.all(promisesList);
} else {
Expand Down
4 changes: 2 additions & 2 deletions dist/modules/ocLazyLoad.loaders.core.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
// Detect file type via file extension
file_type = m[1];
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
// requirejs
file_type = 'js';
} else {
Expand Down Expand Up @@ -104,7 +104,7 @@
if (jsFiles.length > 0) {
var jsDeferred = $q.defer();
$delegate.jsLoader(jsFiles, function (err) {
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
$delegate._$log.error(err);
jsDeferred.reject(err);
} else {
Expand Down
5 changes: 4 additions & 1 deletion dist/modules/ocLazyLoad.loaders.requireJSLoader.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,10 @@
* @param params object config parameters
* because the user can overwrite jsLoader and it will probably not use promises :(
*/
$delegate.jsLoader = require;
$delegate.jsLoader = function (paths, callback, params) {
require(paths, callback, callback, params);
};
$delegate.jsLoader.requirejs = true;

return $delegate;
}]);
Expand Down
8 changes: 4 additions & 4 deletions dist/ocLazyLoad.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* oclazyload - Load modules on demand (lazy load) with angularJS
* @version v1.0.6
* @version v1.0.7
* @link https://github.com/ocombe/ocLazyLoad
* @license MIT
* @author Olivier Combe <olivier.combe@gmail.com>
Expand Down Expand Up @@ -629,7 +629,7 @@
if (angular.isArray(moduleName)) {
var promisesList = [];
angular.forEach(moduleName, function (module) {
promisesList.push(self.inject(moduleName, localParams, real));
promisesList.push(self.inject(module, localParams, real));
});
return $q.all(promisesList);
} else {
Expand Down Expand Up @@ -963,7 +963,7 @@
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
// Detect file type via file extension
file_type = m[1];
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
// requirejs
file_type = 'js';
} else {
Expand Down Expand Up @@ -1023,7 +1023,7 @@
if (jsFiles.length > 0) {
var jsDeferred = $q.defer();
$delegate.jsLoader(jsFiles, function (err) {
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
$delegate._$log.error(err);
jsDeferred.reject(err);
} else {
Expand Down
4 changes: 2 additions & 2 deletions dist/ocLazyLoad.min.js
View file

Large diffs are not rendered by default.

13 changes: 8 additions & 5 deletions dist/ocLazyLoad.require.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**
* oclazyload - Load modules on demand (lazy load) with angularJS
* @version v1.0.6
* @version v1.0.7
* @link https://github.com/ocombe/ocLazyLoad
* @license MIT
* @author Olivier Combe <olivier.combe@gmail.com>
Expand Down Expand Up @@ -629,7 +629,7 @@
if (angular.isArray(moduleName)) {
var promisesList = [];
angular.forEach(moduleName, function (module) {
promisesList.push(self.inject(moduleName, localParams, real));
promisesList.push(self.inject(module, localParams, real));
});
return $q.all(promisesList);
} else {
Expand Down Expand Up @@ -963,7 +963,7 @@
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
// Detect file type via file extension
file_type = m[1];
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
// requirejs
file_type = 'js';
} else {
Expand Down Expand Up @@ -1023,7 +1023,7 @@
if (jsFiles.length > 0) {
var jsDeferred = $q.defer();
$delegate.jsLoader(jsFiles, function (err) {
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
$delegate._$log.error(err);
jsDeferred.reject(err);
} else {
Expand Down Expand Up @@ -1194,7 +1194,10 @@
* @param params object config parameters
* because the user can overwrite jsLoader and it will probably not use promises :(
*/
$delegate.jsLoader = require;
$delegate.jsLoader = function (paths, callback, params) {
require(paths, callback, callback, params);
};
$delegate.jsLoader.requirejs = true;

return $delegate;
}]);
Expand Down

0 comments on commit 47f59c8

Please sign in to comment.