feat(noConflict): restore previous angular namespace reference

1 files changed, 20 insertions, 0 deletions

diff --git a/src/Angular.js b/src/Angular.js
index 5195489e..6ea5d1ad 100644
--- a/src/Angular.js
+++ b/src/Angular.js
@@ -57,6 +57,8 @@ var /** holds major version number for IE or NaN for real browsers */
     push              = [].push,
     toString          = Object.prototype.toString,
 
+
+    _angular          = window.angular, 
     /** @name angular */
     angular           = window.angular || (window.angular = {}),
     angularModule,
@@ -65,6 +67,24 @@ var /** holds major version number for IE or NaN for real browsers */
 
 /**
  * @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;
+}
+
+/**
+ * @ngdoc function
  * @name angular.forEach
  * @function
  *