Skip to content

Commit b57ad20

Browse files
petebacondarwinjamesdaily
authored andcommitted
fix(loader): expose $$minErr to modules such asngResource
This is highlighted in angular-phonecat when you try to use the index-async.html which needs to load the ngResource module asynchronously but fails when it tries to call `angular.$$minErr` to create the $resourceMinErr object. Closes angular#5050
1 parent 08b1ac4 commit b57ad20

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

src/loader.js

+6-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,12 @@ function setupModuleLoader(window) {
1717
return obj[name] || (obj[name] = factory());
1818
}
1919

20-
return ensure(ensure(window, 'angular', Object), 'module', function() {
20+
var angular = ensure(window, 'angular', Object);
21+
22+
// We need to expose `angular.$$minErr` to modules such as `ngResource` that reference it during bootstrap
23+
angular.$$minErr = angular.$$minErr || minErr;
24+
25+
return ensure(angular, 'module', function() {
2126
/** @type {Object.<string, angular.Module>} */
2227
var modules = {};
2328

test/loaderSpec.js

+4
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,8 @@ describe('module loader', function() {
7878
window.angular.module('hasOwnProperty', []);
7979
}).toThrowMinErr('ng','badname', "hasOwnProperty is not a valid module name");
8080
});
81+
82+
it('should expose `$$minErr` on the `angular` object', function() {
83+
expect(window.angular.$$minErr).toEqual(jasmine.any(Function));
84+
})
8185
});

0 commit comments

Comments
 (0)