aboutsummaryrefslogtreecommitdiffstats
path: root/src/Angular.js
diff options
context:
space:
mode:
authorMatias Niemelä2013-06-05 18:12:00 -0400
committerMisko Hevery2013-06-06 22:06:50 -0700
commit9faabd1ba0b1929785bcf166dc0ff60008e7c442 (patch)
tree53412b42b9276cd7d5c679c65ea065d3679c6b77 /src/Angular.js
parent65f5e856a161e7c91b9ebde1360242dc704d0510 (diff)
downloadangular.js-9faabd1ba0b1929785bcf166dc0ff60008e7c442.tar.bz2
chore(AngularPublic): remove angular.noConflict feature
Diffstat (limited to 'src/Angular.js')
-rw-r--r--src/Angular.js18
1 files changed, 0 insertions, 18 deletions
diff --git a/src/Angular.js b/src/Angular.js
index 952e7a1d..c9b6d530 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -64,24 +64,6 @@ var /** holds major version number for IE or NaN for real browsers */
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
* @return {boolean} Returns true if `obj` is an array or array-like object (NodeList, Arguments, ...)