Skip to content

Commit 47f59c8

Browse files
ocombeocombe
committed
chore: bump to 1.0.7
1 parent 1113094 commit 47f59c8

10 files changed

+39
-19
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
<a name="1.0.7"></a>
2+
# 1.0.7 (2015-11-02)
3+
4+
5+
## Bug Fixes
6+
7+
- requirejs error callback
8+
([11130942](https://github.com/ocombe/ocLazyLoad/commit/11130942ab3dbed497a64ab7eac5175e9b3597c4))
9+
- infinite loop in inject
10+
([70859980](https://github.com/ocombe/ocLazyLoad/commit/70859980d0537780c46e5a096d8c3c9cff86de83))
11+
- IE "Invalid calling object" error (attach to DOM and then compile)
12+
([d99ab925](https://github.com/ocombe/ocLazyLoad/commit/d99ab92533ef4bdfa334926307af9f32097592a3))
13+
14+
115
<a name="1.0.6"></a>
216
# 1.0.6 (2015-10-01)
317

‎bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "oclazyload",
3-
"version": "1.0.6",
3+
"version": "1.0.7",
44
"description": "Load modules on demand (lazy load) with angularJS",
55
"main": "dist/ocLazyLoad.js",
66
"homepage": "https://github.com/ocombe/ocLazyLoad",

‎dist/modules/ocLazyLoad.core.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,7 @@
622622
if (angular.isArray(moduleName)) {
623623
var promisesList = [];
624624
angular.forEach(moduleName, function (module) {
625-
promisesList.push(self.inject(moduleName, localParams, real));
625+
promisesList.push(self.inject(module, localParams, real));
626626
});
627627
return $q.all(promisesList);
628628
} else {

‎dist/modules/ocLazyLoad.loaders.core.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
4545
// Detect file type via file extension
4646
file_type = m[1];
47-
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
47+
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
4848
// requirejs
4949
file_type = 'js';
5050
} else {
@@ -104,7 +104,7 @@
104104
if (jsFiles.length > 0) {
105105
var jsDeferred = $q.defer();
106106
$delegate.jsLoader(jsFiles, function (err) {
107-
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
107+
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
108108
$delegate._$log.error(err);
109109
jsDeferred.reject(err);
110110
} else {

‎dist/modules/ocLazyLoad.loaders.requireJSLoader.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@
1111
* @param params object config parameters
1212
* because the user can overwrite jsLoader and it will probably not use promises :(
1313
*/
14-
$delegate.jsLoader = require;
14+
$delegate.jsLoader = function (paths, callback, params) {
15+
require(paths, callback, callback, params);
16+
};
17+
$delegate.jsLoader.requirejs = true;
1518

1619
return $delegate;
1720
}]);

‎dist/ocLazyLoad.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* oclazyload - Load modules on demand (lazy load) with angularJS
3-
* @version v1.0.6
3+
* @version v1.0.7
44
* @link https://github.com/ocombe/ocLazyLoad
55
* @license MIT
66
* @author Olivier Combe <olivier.combe@gmail.com>
@@ -629,7 +629,7 @@
629629
if (angular.isArray(moduleName)) {
630630
var promisesList = [];
631631
angular.forEach(moduleName, function (module) {
632-
promisesList.push(self.inject(moduleName, localParams, real));
632+
promisesList.push(self.inject(module, localParams, real));
633633
});
634634
return $q.all(promisesList);
635635
} else {
@@ -963,7 +963,7 @@
963963
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
964964
// Detect file type via file extension
965965
file_type = m[1];
966-
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
966+
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
967967
// requirejs
968968
file_type = 'js';
969969
} else {
@@ -1023,7 +1023,7 @@
10231023
if (jsFiles.length > 0) {
10241024
var jsDeferred = $q.defer();
10251025
$delegate.jsLoader(jsFiles, function (err) {
1026-
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
1026+
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
10271027
$delegate._$log.error(err);
10281028
jsDeferred.reject(err);
10291029
} else {

‎dist/ocLazyLoad.min.js‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎dist/ocLazyLoad.require.js‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
22
* oclazyload - Load modules on demand (lazy load) with angularJS
3-
* @version v1.0.6
3+
* @version v1.0.7
44
* @link https://github.com/ocombe/ocLazyLoad
55
* @license MIT
66
* @author Olivier Combe <olivier.combe@gmail.com>
@@ -629,7 +629,7 @@
629629
if (angular.isArray(moduleName)) {
630630
var promisesList = [];
631631
angular.forEach(moduleName, function (module) {
632-
promisesList.push(self.inject(moduleName, localParams, real));
632+
promisesList.push(self.inject(module, localParams, real));
633633
});
634634
return $q.all(promisesList);
635635
} else {
@@ -963,7 +963,7 @@
963963
if ((m = /[.](css|less|html|htm|js)?((\?|#).*)?$/.exec(path)) !== null) {
964964
// Detect file type via file extension
965965
file_type = m[1];
966-
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('load')) {
966+
} else if (!$delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader') && $delegate.jsLoader.hasOwnProperty('requirejs')) {
967967
// requirejs
968968
file_type = 'js';
969969
} else {
@@ -1023,7 +1023,7 @@
10231023
if (jsFiles.length > 0) {
10241024
var jsDeferred = $q.defer();
10251025
$delegate.jsLoader(jsFiles, function (err) {
1026-
if (angular.isDefined(err) && $delegate.jsLoader.hasOwnProperty('ocLazyLoadLoader')) {
1026+
if (angular.isDefined(err) && ($delegate.jsLoader.hasOwnProperty("ocLazyLoadLoader") || $delegate.jsLoader.hasOwnProperty("requirejs"))) {
10271027
$delegate._$log.error(err);
10281028
jsDeferred.reject(err);
10291029
} else {
@@ -1194,7 +1194,10 @@
11941194
* @param params object config parameters
11951195
* because the user can overwrite jsLoader and it will probably not use promises :(
11961196
*/
1197-
$delegate.jsLoader = require;
1197+
$delegate.jsLoader = function (paths, callback, params) {
1198+
require(paths, callback, callback, params);
1199+
};
1200+
$delegate.jsLoader.requirejs = true;
11981201

11991202
return $delegate;
12001203
}]);

0 commit comments

Comments
 (0)