Skip to content

Commit

Permalink
correct whitespace errors
Browse files Browse the repository at this point in the history
These were introduced during rebasing while working on the extend branch due to misconfigured (global) gitconfig (it would replace 8 spaces with a tab character)
  • Loading branch information
jameshadfield committed Jan 15, 2019
1 parent c36ca60 commit c8f94cc
Show file tree
Hide file tree
Showing 17 changed files with 237 additions and 237 deletions.
6 changes: 3 additions & 3 deletions cli/build.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ const run = (args) => {
console.log(stats.toString({colors: true}));
} else {
if (stats.hasWarnings()) {
utils.warn("Webpack has warnings (run with '--verbose' to see them)");
utils.warn("Webpack has warnings (run with '--verbose' to see them)");
}
if (global.AUSPICE_VERBOSE) {
console.log(stats.toString({colors: true}));
console.log(stats.toString({colors: true}));
}
if (customOutputPath) {
utils.exportIndexDotHtml({relative: args.serverless});
utils.exportIndexDotHtml({relative: args.serverless});
}
}
});
Expand Down
8 changes: 4 additions & 4 deletions cli/server/parseNarrative.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,13 @@ const makeFrontMatterBlock = (frontMatter) => {
utils.warn(`Narrative parsing -- can't do author arrays yet`);
} else if (typeof frontMatter.authors === 'string') {
if (frontMatter.authorLinks && typeof frontMatter.authorLinks === "string") {
markdown.push(`### Author: [${frontMatter.authors}](${frontMatter.authorLinks})`);
markdown.push(`### Author: [${frontMatter.authors}](${frontMatter.authorLinks})`);
} else {
markdown.push(`### Author: ${frontMatter.authors}`);
markdown.push(`### Author: ${frontMatter.authors}`);
}
if (frontMatter.affiliations && typeof frontMatter.affiliations === "string") {
markdown[markdown.length-1] += " <sup> 1 </sup>";
markdown.push(`<sup> 1 </sup> ${frontMatter.affiliations}`);
markdown[markdown.length-1] += " <sup> 1 </sup>";
markdown.push(`<sup> 1 </sup> ${frontMatter.affiliations}`);
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions docs-src/website/sidebars.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,20 +8,20 @@
"Customisations": [
"customisations/introduction",
{
"type": "subcategory",
"label": "Customising the Client",
"ids": [
"customisations/client/componentInterfaces",
"customisations/client/sidebarTheme"
]
"type": "subcategory",
"label": "Customising the Client",
"ids": [
"customisations/client/componentInterfaces",
"customisations/client/sidebarTheme"
]
},
{
"type": "subcategory",
"label": "Customising the Server",
"ids": [
"customisations/server/charonAPI",
"customisations/server/serverless"
]
"type": "subcategory",
"label": "Customising the Server",
"ids": [
"customisations/server/charonAPI",
"customisations/server/serverless"
]
},
"customisations/authentication"
],
Expand Down
26 changes: 13 additions & 13 deletions src/components/controls/choose-branch-labelling.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ class ChooseBranchLabelling extends React.Component {
render() {
return (
<div style={{paddingTop: 5}}>
<SidebarSubtitle>
Branch Labels
</SidebarSubtitle>
<div style={{width: controlsWidth, fontSize: 14}}>
<Select
value={this.props.selected}
options={this.props.available.map((x) => ({value: x, label: x}))}
clearable={false}
searchable={false}
multi={false}
onChange={this.change}
/>
</div>
<SidebarSubtitle>
Branch Labels
</SidebarSubtitle>
<div style={{width: controlsWidth, fontSize: 14}}>
<Select
value={this.props.selected}
options={this.props.available.map((x) => ({value: x, label: x}))}
clearable={false}
searchable={false}
multi={false}
onChange={this.change}
/>
</div>
</div>
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/controls/choose-dataset-select.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class ChooseDatasetSelect extends React.Component {
clearable={false}
searchable={false}
multi={false}
onChange={(opt) => {this.changeDataset(this.createDataPath(opt.value));}}
onChange={(opt) => {this.changeDataset(this.createDataPath(opt.value));}}
/>
</div>
);
Expand Down
24 changes: 12 additions & 12 deletions src/components/controls/choose-dataset.js
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,9 @@ class ChooseDataset extends React.Component {
if (!this.props.available || !this.props.available.datasets) {
/* TODO expose this to the extension API */
if (this.props.source === "github") {
return (<GithubInfo/>);
return (<GithubInfo/>);
} else if (this.props.source === "dropped") {
return (<DroppedFiles/>);
return (<DroppedFiles/>);
}
return (<BareDataPath source={this.props.source} pathname={this.props.pathname}/>);
}
Expand All @@ -65,7 +65,7 @@ class ChooseDataset extends React.Component {
.split("/");
displayedDataset.forEach((part, idx) => {
if (part.includes(":")) {
displayedDataset[idx] = part.split(":")[0];
displayedDataset[idx] = part.split(":")[0];
}
});

Expand All @@ -74,7 +74,7 @@ class ChooseDataset extends React.Component {
this.props.available.datasets.forEach((d) => {
const firstField = d.request.split("/")[0];
if (!options[0].includes(firstField)) {
options[0].push(firstField);
options[0].push(firstField);
}
});

Expand All @@ -83,12 +83,12 @@ class ChooseDataset extends React.Component {
in order to create available alternatives for each field */
options[idx] = [];
this.props.available.datasets.forEach((singleAvailableOption) => {
/* if the parents (and their parents etc) of this choice match,
then we add that as a valid option */
const fields = singleAvailableOption.request.split("/");
if (checkEqualityOfArrays(fields, displayedDataset, idx) && options[idx].indexOf(fields[idx]) === -1) {
options[idx].push(fields[idx]);
}
/* if the parents (and their parents etc) of this choice match,
then we add that as a valid option */
const fields = singleAvailableOption.request.split("/");
if (checkEqualityOfArrays(fields, displayedDataset, idx) && options[idx].indexOf(fields[idx]) === -1) {
options[idx].push(fields[idx]);
}
});
}

Expand All @@ -99,8 +99,8 @@ class ChooseDataset extends React.Component {
<ChooseDatasetSelect
dispatch={this.props.dispatch}
source={this.props.source}
choice_tree={displayedDataset.slice(0, i)}
selected={displayedDataset[i]}
choice_tree={displayedDataset.slice(0, i)}
selected={displayedDataset[i]}
options={options[i]}
/>
</div>
Expand Down
32 changes: 16 additions & 16 deletions src/components/controls/choose-second-tree.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,37 +25,37 @@ class ChooseSecondTree extends React.Component {
.split("/");
displayedDataset.forEach((part, idx) => {
if (part.includes(":")) {
displayedDataset[idx] = part.split(":")[0];
displayedDataset[idx] = part.split(":")[0];
}
});
const idxOfTree = displayedDataset.indexOf(this.props.treeName);

const matches = this.props.available.datasets
.map((datasetObj) => datasetObj.request.split("/"))
.filter((dataset) => {
if (dataset.length !== displayedDataset.length) return false;
for (let i=0; i<dataset.length; i++) {
if (i===idxOfTree) {
if (dataset[i] === displayedDataset[i]) {
return false; // don't match the same tree name
}
} else if (dataset[i] !== displayedDataset[i]) {
return false; // everything apart from the tree much match
if (dataset.length !== displayedDataset.length) return false;
for (let i=0; i<dataset.length; i++) {
if (i===idxOfTree) {
if (dataset[i] === displayedDataset[i]) {
return false; // don't match the same tree name
}
} else if (dataset[i] !== displayedDataset[i]) {
return false; // everything apart from the tree much match
}
}
return true;
return true;
});

const options = matches.map((m) => m[idxOfTree]);
if (this.props.showTreeToo) options.unshift("REMOVE");

return (
<div>
<SidebarSubtitle spaceAbove>
Second Tree
</SidebarSubtitle>
<div key={"treetooselect"} style={{width: controlsWidth, fontSize: 14}}>
<Select
<SidebarSubtitle spaceAbove>
Second Tree
</SidebarSubtitle>
<div key={"treetooselect"} style={{width: controlsWidth, fontSize: 14}}>
<Select
name="selectTreeToo"
id="selectTreeToo"
value={this.props.showTreeToo}
Expand All @@ -67,7 +67,7 @@ class ChooseSecondTree extends React.Component {
if (opt.value === "REMOVE") {
this.props.dispatch({type: REMOVE_TREE_TOO});
} else {
const dataPath = [...displayedDataset];
const dataPath = [...displayedDataset];
dataPath.splice(idxOfTree, 1, opt.value);
this.props.dispatch(loadTreeToo(opt.value, dataPath));
}
Expand Down
80 changes: 40 additions & 40 deletions src/components/controls/map-animation.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,49 +47,49 @@ class MapAnimationControls extends React.Component {
return (
<div id="mapAnimationControls">

<SidebarSubtitle spaceAbove>
Animation Speed
</SidebarSubtitle>
<SidebarSubtitle spaceAbove>
Animation Speed
</SidebarSubtitle>

<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 60000}
onClick={this.handleChangeAnimationTimeClicked("slow")}
>
Slow
</SidebarButton>
<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 30000}
onClick={this.handleChangeAnimationTimeClicked("medium")}
>
Medium
</SidebarButton>
<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 15000}
onClick={this.handleChangeAnimationTimeClicked("fast")}
>
Fast
</SidebarButton>
<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 60000}
onClick={this.handleChangeAnimationTimeClicked("slow")}
>
Slow
</SidebarButton>
<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 30000}
onClick={this.handleChangeAnimationTimeClicked("medium")}
>
Medium
</SidebarButton>
<SidebarButton
selected={this.props.mapAnimationDurationInMilliseconds === 15000}
onClick={this.handleChangeAnimationTimeClicked("fast")}
>
Fast
</SidebarButton>

<div style={{marginBottom: 5}}/>
<div style={{marginBottom: 5}}/>

<Toggle
display
on={this.props.mapAnimationShouldLoop}
callback={() => {
this.props.dispatch({ type: CHANGE_ANIMATION_LOOP, data: !this.props.mapAnimationShouldLoop });
}}
label="Loop animation"
/>
<br/>
<Toggle
display
on={this.props.mapAnimationCumulative}
callback={() => {
analyticsControlsEvent("change-animation-cumulative");
this.props.dispatch({ type: CHANGE_ANIMATION_CUMULATIVE, data: !this.props.mapAnimationCumulative });
}}
label="Animate cumulative history"
/>
<Toggle
display
on={this.props.mapAnimationShouldLoop}
callback={() => {
this.props.dispatch({ type: CHANGE_ANIMATION_LOOP, data: !this.props.mapAnimationShouldLoop });
}}
label="Loop animation"
/>
<br/>
<Toggle
display
on={this.props.mapAnimationCumulative}
callback={() => {
analyticsControlsEvent("change-animation-cumulative");
this.props.dispatch({ type: CHANGE_ANIMATION_CUMULATIVE, data: !this.props.mapAnimationCumulative });
}}
label="Animate cumulative history"
/>

</div>
);
Expand Down
8 changes: 4 additions & 4 deletions src/components/controls/search.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,10 @@ class SearchStrains extends React.Component {
render() {
return (
<Container>
<SidebarSubtitle spaceAbove>Search Strains</SidebarSubtitle>
<InputContainer>
<Input ref={(r) => {this.ref = r;}} onFocus={() => this.updateVisibleStrains()}/>
</InputContainer>
<SidebarSubtitle spaceAbove>Search Strains</SidebarSubtitle>
<InputContainer>
<Input ref={(r) => {this.ref = r;}} onFocus={() => this.updateVisibleStrains()}/>
</InputContainer>
<Cross show={this.state.show} onClick={this.removeSelection}/>
</Container>
);
Expand Down
Loading

0 comments on commit c8f94cc

Please sign in to comment.