chore(AngularPublic): remove angular.noConflict feature

This commit is contained in:
Matias Niemelä 2013-06-05 18:12:00 -04:00 committed by Misko Hevery
parent 65f5e856a1
commit 9faabd1ba0
3 changed files with 1 additions and 42 deletions

View file

@ -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

View file

@ -48,8 +48,7 @@ function publishExternalAPI(angular){
'isDate': isDate,
'lowercase': lowercase,
'uppercase': uppercase,
'callbacks': {counter: 0},
'noConflict': noConflict
'callbacks': {counter: 0}
});
angularModule = setupModuleLoader(window);

View file

@ -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();
});
});
});