Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revise prettyString function to not lowercase further characters #685

Merged
merged 1 commit into from
Dec 18, 2018
Merged

Revise prettyString function to not lowercase further characters #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/components/tree/legend/legend.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,7 @@ class Legend extends React.Component {
}

styleLabelText(label) {
if (this.props.colorBy === "clade_membership") {
return label; /* unchanged */
} else if (this.props.colorBy === "num_date") {
if (this.props.colorBy === "num_date") {
const legendValues = this.props.colorScale.legendValues;
if (
(legendValues[legendValues.length-1] - legendValues[0] > 10) && /* range spans more than 10 years */
Expand Down
2 changes: 1 addition & 1 deletion src/util/stringHelpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const prettyString = (x, {multiplier = false, trim = 0, camelCase = true,
}
x = x.replace(/_/g, " ");
if (camelCase) {
x = x.replace(/\w\S*/g, (y) => y.charAt(0).toUpperCase() + y.substr(1).toLowerCase());
x = x.replace(/\w\S*/g, (y) => y.charAt(0).toUpperCase() + y.substr(1));
}
if (removeComma) {
x = x.replace(/,/g, "");
Expand Down