little fixes

This commit is contained in:
Connor Turland 2017-03-16 02:27:21 -04:00
parent 77297f9f17
commit b21250db28
4 changed files with 11 additions and 3 deletions

View file

@ -135,8 +135,8 @@ const Map = {
}, },
end: function() { end: function() {
if (Active.Map) { if (Active.Map) {
$('.main').removeClass('compressed')
AutoLayout.resetSpiral() AutoLayout.resetSpiral()
$('.rightclickmenu').remove() $('.rightclickmenu').remove()
TopicCard.hideCard() TopicCard.hideCard()
SynapseCard.hideCard() SynapseCard.hideCard()

View file

@ -47,6 +47,10 @@ export default class MapView extends Component {
} }
} }
componentWillUnmount() {
this.endMap()
}
endMap() { endMap() {
this.setState({ this.setState({
chatOpen: false chatOpen: false

View file

@ -30,6 +30,10 @@ export default class TopicView extends Component {
onZoomOut: PropTypes.func onZoomOut: PropTypes.func
} }
componentWillUnmount() {
this.endTopic()
}
endTopic() { endTopic() {
this.upperOptions.reset() this.upperOptions.reset()
this.props.endActiveTopic() this.props.endActiveTopic()

View file

@ -41,7 +41,7 @@ class FilterBox extends Component {
+ (allForFiltering.synapses.length === visibleForFiltering.synapses.length ? ' active' : '') + (allForFiltering.synapses.length === visibleForFiltering.synapses.length ? ' active' : '')
const synapseNoneClass = "hideAll hideAllSynapses" const synapseNoneClass = "hideAll hideAllSynapses"
+ (visibleForFiltering.synapses.length === 0 ? ' active' : '') + (visibleForFiltering.synapses.length === 0 ? ' active' : '')
return <div className="sidebarFilterBox upperRightBox" style={style}> return map || topic ? <div className="sidebarFilterBox upperRightBox" style={style}>
<div className="filterBox"> <div className="filterBox">
<h2>FILTER BY</h2> <h2>FILTER BY</h2>
<div id="filter_by_mapper" className="filterBySection"> <div id="filter_by_mapper" className="filterBySection">
@ -90,7 +90,7 @@ class FilterBox extends Component {
<div className="clearfloat"></div> <div className="clearfloat"></div>
</div> </div>
</div> </div>
</div> </div> : null
} }
} }