Re-fix #535 fix reversed noConflict in DjDT jQuery include #590
Conversation
This file contains hidden or 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
Contributor
Author
|
You're right, the logic is right. We're still experiencing pain with RequireJS however, even with the attempt to use the vendored jquery. New patch coming that addresses it. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Per my comment at 727b4e0#diff-4f4a91c0e3639b7eb74d3dc23799f72dR8
I believe the noConflict call is swapped; using your own JQUERY_URL should not use noConflict, while using the "bundled" one of DjDT should use noConflict. The code as currently written does the reverse, and both break in my app that uses both require.js and other jQuery plugins, with the jQuery plugins unable to find the jQuery "$" object.
This pull request reverses those, fixing that.
If this pull request is accepted, an expedited 1.2.1 release would be appreciated! Thanks!