diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Angular.js | 18 | ||||
| -rwxr-xr-x | src/AngularPublic.js | 3 |
2 files changed, 1 insertions, 20 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, ...) diff --git a/src/AngularPublic.js b/src/AngularPublic.js index 8330c067..53ad5aab 100755 --- 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); |
