chore(AngularPublic): remove angular.noConflict feature

angular · Jun 7, 2013 · 9faabd1 · 9faabd1 · snostorm · Dec 5, 2013
1 parent 65f5e85
commit 9faabd1
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 42 deletions.
diff --git a/src/Angular.js b/src/Angular.js
@@ -63,24 +63,6 @@ var /** holds major version number for IE or NaN for real browsers */
     nodeName_,
     uid               = ['0', '0', '0'];
 
-/**
- * @ngdoc function
- * @name angular.noConflict
- * @function
- *
- * @description
- * Restores the previous global value of angular and returns the current instance. Other libraries may already use the
- * angular namespace. Or a previous version of angular is already loaded on the page. In these cases you may want to
- * restore the previous namespace and keep a reference to angular.
- *
- * @return {Object} The current angular namespace
- */
-function noConflict() {
-  var a = window.angular;
-  window.angular = _angular;
-  return a;
-}
-
 /**
  * @private
  * @param {*} obj

diff --git a/src/AngularPublic.js b/src/AngularPublic.js
@@ -48,8 +48,7 @@ function publishExternalAPI(angular){
     'isDate': isDate,
     'lowercase': lowercase,
     'uppercase': uppercase,
-    'callbacks': {counter: 0},
-    'noConflict': noConflict
+    'callbacks': {counter: 0}
   });
 
   angularModule = setupModuleLoader(window);

diff --git a/test/AngularSpec.js b/test/AngularSpec.js
@@ -877,26 +877,4 @@ describe('angular', function() {
     }));
   });
 
-  describe('noConflict', function() {
-    var globalAngular;
-    beforeEach(function() {
-      globalAngular = angular;
-    });
-
-    afterEach(function() {
-      angular = globalAngular;
-    });
-
-    it('should return angular', function() {
-      var a = angular.noConflict();
-      expect(a).toBe(globalAngular);
-    });
-
-    it('should restore original angular', function() {
-      var a = angular.noConflict();
-      expect(angular).toBeUndefined();
-    });
-
-  });
-
 });