diff options
| author | James Morrin | 2012-11-06 17:35:47 -0500 |
|---|---|---|
| committer | Misko Hevery | 2013-02-14 14:43:55 -0800 |
| commit | 12ba6cec4fb79521101744e02a7e09f9fbb591c4 (patch) | |
| tree | 618987b1edd5ec5a871a000e45b6b69d35e889f6 /src/AngularPublic.js | |
| parent | b7e1fb0515798e1b4f3f2426f6b050951bee2617 (diff) | |
| download | angular.js-12ba6cec4fb79521101744e02a7e09f9fbb591c4.tar.bz2 | |
feat(noConflict): restore previous angular namespace reference
Diffstat (limited to 'src/AngularPublic.js')
| -rw-r--r-- | src/AngularPublic.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/AngularPublic.js b/src/AngularPublic.js index 61c77af3..9928a125 100644 --- a/src/AngularPublic.js +++ b/src/AngularPublic.js @@ -48,7 +48,8 @@ function publishExternalAPI(angular){ 'isDate': isDate, 'lowercase': lowercase, 'uppercase': uppercase, - 'callbacks': {counter: 0} + 'callbacks': {counter: 0}, + 'noConflict': noConflict }); angularModule = setupModuleLoader(window); |