Skip to content

Commit 6c16c6b

Browse files
ocombeocombe
committed
chore: bump to 1.0.6
1 parent 886b631 commit 6c16c6b

File tree

9 files changed

+37
-17
lines changed

9 files changed

+37
-17
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.6"></a>
2+
# 1.0.6 (2015-10-01)
3+
4+
5+
## Bug Fixes
6+
- calling inject from loaders should pass the "real" module param
7+
([953584e8](https://github.com/ocombe/ocLazyLoad/commit/953584e8989de7ed1c2166ca193c899bad8a3478),
8+
[#221](https://github.com/ocombe/ocLazyLoad/issues/221))
9+
- directive compile original contents after dependency is loaded.
10+
([a48e3ceb](https://github.com/ocombe/ocLazyLoad/commit/a48e3ceba1945e74478a0a7f964f9aa84e027799),
11+
[#168](https://github.com/ocombe/ocLazyLoad/issues/168),
12+
[#194](https://github.com/ocombe/ocLazyLoad/issues/194))
13+
14+
115
<a name="1.0.5"></a>
216
# 1.0.5 (2015-09-11)
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.5",
3+
"version": "1.0.6",
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: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -610,21 +610,23 @@
610610
* Inject new modules into Angular
611611
* @param moduleName
612612
* @param localParams
613+
* @param real
613614
*/
614615
inject: function inject(moduleName) {
615616
var localParams = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
617+
var real = arguments.length <= 2 || arguments[2] === undefined ? false : arguments[2];
616618

617619
var self = this,
618620
deferred = $q.defer();
619621
if (angular.isDefined(moduleName) && moduleName !== null) {
620622
if (angular.isArray(moduleName)) {
621623
var promisesList = [];
622624
angular.forEach(moduleName, function (module) {
623-
promisesList.push(self.inject(module));
625+
promisesList.push(self.inject(moduleName, localParams, real));
624626
});
625627
return $q.all(promisesList);
626628
} else {
627-
self._addToLoadList(self._getModuleName(moduleName), true);
629+
self._addToLoadList(self._getModuleName(moduleName), true, real);
628630
}
629631
}
630632
if (modulesToLoad.length > 0) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@
211211

212212
// if someone used an external loader and called the load function with just the module name
213213
if (angular.isUndefined(config.files) && angular.isDefined(config.name) && $delegate.moduleExists(config.name)) {
214-
return $delegate.inject(config.name, localParams);
214+
return $delegate.inject(config.name, localParams, true);
215215
}
216216

217217
$delegate.filesLoader(config, localParams).then(function () {

‎dist/ocLazyLoad.js‎

Lines changed: 6 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.5
3+
* @version v1.0.6
44
* @link https://github.com/ocombe/ocLazyLoad
55
* @license MIT
66
* @author Olivier Combe <olivier.combe@gmail.com>
@@ -617,21 +617,23 @@
617617
* Inject new modules into Angular
618618
* @param moduleName
619619
* @param localParams
620+
* @param real
620621
*/
621622
inject: function inject(moduleName) {
622623
var localParams = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
624+
var real = arguments.length <= 2 || arguments[2] === undefined ? false : arguments[2];
623625

624626
var self = this,
625627
deferred = $q.defer();
626628
if (angular.isDefined(moduleName) && moduleName !== null) {
627629
if (angular.isArray(moduleName)) {
628630
var promisesList = [];
629631
angular.forEach(moduleName, function (module) {
630-
promisesList.push(self.inject(module));
632+
promisesList.push(self.inject(moduleName, localParams, real));
631633
});
632634
return $q.all(promisesList);
633635
} else {
634-
self._addToLoadList(self._getModuleName(moduleName), true);
636+
self._addToLoadList(self._getModuleName(moduleName), true, real);
635637
}
636638
}
637639
if (modulesToLoad.length > 0) {
@@ -1123,7 +1125,7 @@
11231125

11241126
// if someone used an external loader and called the load function with just the module name
11251127
if (angular.isUndefined(config.files) && angular.isDefined(config.name) && $delegate.moduleExists(config.name)) {
1126-
return $delegate.inject(config.name, localParams);
1128+
return $delegate.inject(config.name, localParams, true);
11271129
}
11281130

11291131
$delegate.filesLoader(config, localParams).then(function () {

‎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: 6 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.5
3+
* @version v1.0.6
44
* @link https://github.com/ocombe/ocLazyLoad
55
* @license MIT
66
* @author Olivier Combe <olivier.combe@gmail.com>
@@ -617,21 +617,23 @@
617617
* Inject new modules into Angular
618618
* @param moduleName
619619
* @param localParams
620+
* @param real
620621
*/
621622
inject: function inject(moduleName) {
622623
var localParams = arguments.length <= 1 || arguments[1] === undefined ? {} : arguments[1];
624+
var real = arguments.length <= 2 || arguments[2] === undefined ? false : arguments[2];
623625

624626
var self = this,
625627
deferred = $q.defer();
626628
if (angular.isDefined(moduleName) && moduleName !== null) {
627629
if (angular.isArray(moduleName)) {
628630
var promisesList = [];
629631
angular.forEach(moduleName, function (module) {
630-
promisesList.push(self.inject(module));
632+
promisesList.push(self.inject(moduleName, localParams, real));
631633
});
632634
return $q.all(promisesList);
633635
} else {
634-
self._addToLoadList(self._getModuleName(moduleName), true);
636+
self._addToLoadList(self._getModuleName(moduleName), true, real);
635637
}
636638
}
637639
if (modulesToLoad.length > 0) {
@@ -1123,7 +1125,7 @@
11231125

11241126
// if someone used an external loader and called the load function with just the module name
11251127
if (angular.isUndefined(config.files) && angular.isDefined(config.name) && $delegate.moduleExists(config.name)) {
1126-
return $delegate.inject(config.name, localParams);
1128+
return $delegate.inject(config.name, localParams, true);
11271129
}
11281130

11291131
$delegate.filesLoader(config, localParams).then(function () {

0 commit comments

Comments
 (0)