This repository was archived by the owner on Apr 12, 2024. It is now read-only.
File tree 3 files changed +1
-42
lines changed
3 files changed +1
-42
lines changed Original file line number Diff line number Diff line change @@ -63,24 +63,6 @@ var /** holds major version number for IE or NaN for real browsers */
63
63
nodeName_ ,
64
64
uid = [ '0' , '0' , '0' ] ;
65
65
66
- /**
67
- * @ngdoc function
68
- * @name angular.noConflict
69
- * @function
70
- *
71
- * @description
72
- * Restores the previous global value of angular and returns the current instance. Other libraries may already use the
73
- * angular namespace. Or a previous version of angular is already loaded on the page. In these cases you may want to
74
- * restore the previous namespace and keep a reference to angular.
75
- *
76
- * @return {Object } The current angular namespace
77
- */
78
- function noConflict ( ) {
79
- var a = window . angular ;
80
- window . angular = _angular ;
81
- return a ;
82
- }
83
-
84
66
/**
85
67
* @private
86
68
* @param {* } obj
Original file line number Diff line number Diff line change @@ -48,8 +48,7 @@ function publishExternalAPI(angular){
48
48
'isDate' : isDate ,
49
49
'lowercase' : lowercase ,
50
50
'uppercase' : uppercase ,
51
- 'callbacks' : { counter : 0 } ,
52
- 'noConflict' : noConflict
51
+ 'callbacks' : { counter : 0 }
53
52
} ) ;
54
53
55
54
angularModule = setupModuleLoader ( window ) ;
Original file line number Diff line number Diff line change @@ -877,26 +877,4 @@ describe('angular', function() {
877
877
} ) ) ;
878
878
} ) ;
879
879
880
- describe ( 'noConflict' , function ( ) {
881
- var globalAngular ;
882
- beforeEach ( function ( ) {
883
- globalAngular = angular ;
884
- } ) ;
885
-
886
- afterEach ( function ( ) {
887
- angular = globalAngular ;
888
- } ) ;
889
-
890
- it ( 'should return angular' , function ( ) {
891
- var a = angular . noConflict ( ) ;
892
- expect ( a ) . toBe ( globalAngular ) ;
893
- } ) ;
894
-
895
- it ( 'should restore original angular' , function ( ) {
896
- var a = angular . noConflict ( ) ;
897
- expect ( angular ) . toBeUndefined ( ) ;
898
- } ) ;
899
-
900
- } ) ;
901
-
902
880
} ) ;
You can’t perform that action at this time.
0 commit comments