Issue/1682 - #2440
Merged
Merged
Conversation
xsrust
commented
Mar 26, 2020
xsrust
commented
Contributor
- refactor the body of the accordions into a separate partial
- Conditionally call the accordions or just the body based on whether the user's org is a funder
- Made the JS more robust against the chart-data not existing on the page
- Remove the 'Monthly Usage' download for funders, and add in some spacing to make the top buttons align if removed.
…made the js more robust to the charts not existing
briri
approved these changes
Mar 26, 2020
| @@ -1,4 +1,4 @@ | |||
| import { isObject } from '../../utils/isType'; | |||
| import { isObject, isUndefined } from '../../utils/isType'; | |||
Contributor
There was a problem hiding this comment.
👍 I probably should have been using this one!
| const usersData = JSON.parse($('#users_joined').val()); | ||
| if (isObject(usersData)) { | ||
| createChart('#yearly_users', usersData); | ||
| if (!isUndefined($('#users_joined').val())) { |
Contributor
There was a problem hiding this comment.
good. I hope these checks become unnecessary in future versions of Rails' asset pipeline. It would be better if it just sent the client browser the JS it actually needs for the page.
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.