Merged
Conversation
added 2 commits
October 15, 2012 11:23
…if the config.action_view.javascript_expansions option exists (since it does not in Rails 4).
Contributor
Author
|
The CHANGELOG modification can be ommitted from the merge of this pull, as it was already merged (in #81). |
Member
There was a problem hiding this comment.
Don't undersell yourself! You also made this work at all, since the file is named jquery_ujs, and not rails. :)
Member
There was a problem hiding this comment.
Hmm, or I could have misread the diff. Still, thanks for the patch! :)
Contributor
Author
There was a problem hiding this comment.
This is just condensing the logic from 2 lines (previously 20 & 21) into 1 line (20).
indirect
added a commit
that referenced
this pull request
Dec 20, 2012
Refactored code on the Railtie Conflicts: CHANGELOG.md
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
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.
The
railtiecode is currently executing the logic to build an array of javascript files (jq_defaults) to include in thejavascript_expansions[:defaults]regardless of whether it's actually necessary.This pull request contains modified code which prevents that block of code from being invoked if the user's rails application doesn't require it. (which is the case for rails apps that use the asset pipeline)