This repository has been archived by the owner on Apr 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 27.5k
feat(noConflict): restore previous namespace #1535
Closed
Closed
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
4c677a2
feat(noConflict): restore previous namespace
treasonx f25a863
feat(noConflict): restore previous namespace
treasonx a5cf997
feat(noConflict): restore previous namespace
treasonx 0302817
feat(noConflict): restore previous namespace
treasonx 0254429
Merge branch 'jm_noConflict' of github.com:treasonx/angular.js into j…
treasonx File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -58,12 +58,30 @@ var Error = window.Error, | |
push = [].push, | ||
toString = Object.prototype.toString, | ||
|
||
|
||
_angular = window.angular, | ||
/** @name angular */ | ||
angular = window.angular || (window.angular = {}), | ||
angularModule, | ||
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. | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Per the contribution guidelines, all lines must wrap at 100 characters |
||
* | ||
* @returns {Object} the current angular namespace | ||
*/ | ||
function noConflict() { | ||
var a = window.angular; | ||
window.angular = _angular; | ||
return a; | ||
} | ||
|
||
/** | ||
* @ngdoc function | ||
* @name angular.forEach | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I haven't tried your patch, but looking at this line, it seems Angular will reuse any existing
window.angular
and extend it. This goes directly against the principle of returning the old value unchanged, and in fact turnsnoConflict()
into a no-op.