Merge branch 'master' into stream-refetch-tweak

This commit is contained in:
David Erwin
2017-04-06 10:03:00 -04:00
committed by GitHub
+2 -2
View File
@@ -117,7 +117,7 @@ class Embed extends Component {
render () {
const {activeTab} = this.state;
const {closedAt, countCache = {}} = this.props.asset;
const {loading, asset, refetch, comment} = this.props.data;
const {asset, refetch, comment} = this.props.data;
const {loggedIn, isAdmin, user, showSignInDialog, signInOffset} = this.props.auth;
// even though the permalinked comment is the highlighted one, we're displaying its parent + replies
@@ -131,7 +131,7 @@ class Embed extends Component {
minHeight: document.body.scrollHeight + 200
} : {};
if (loading || !asset) {
if (!asset) {
return <Spinner />;
}