From d53c3d4db662a7dc9c18690bb6b6fb874e3b27a1 Mon Sep 17 00:00:00 2001 From: 6ea86b96 <6ea86b96@gmail.com> Date: Thu, 22 Jun 2017 21:17:01 +0700 Subject: [PATCH 1/2] Fix this.state.hovered null error --- ui/js/component/fileCard/view.jsx | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ui/js/component/fileCard/view.jsx b/ui/js/component/fileCard/view.jsx index bf0901035..e703a7333 100644 --- a/ui/js/component/fileCard/view.jsx +++ b/ui/js/component/fileCard/view.jsx @@ -7,6 +7,14 @@ import FilePrice from "component/filePrice"; import UriIndicator from "component/uriIndicator"; class FileCard extends React.PureComponent { + constructor(props) { + super(props); + + this.state = { + hovered: false, + }; + } + componentWillMount() { this.resolve(this.props); } From c4827c853d1cf01b819220e3c6a46cfa489f0111 Mon Sep 17 00:00:00 2001 From: 6ea86b96 <6ea86b96@gmail.com> Date: Thu, 22 Jun 2017 22:13:33 +0700 Subject: [PATCH 2/2] remove pointless nulls --- ui/js/component/fileCard/view.jsx | 30 +++++++++++++++--------------- ui/js/component/fileTile/view.jsx | 29 ++++++++++++++--------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/ui/js/component/fileCard/view.jsx b/ui/js/component/fileCard/view.jsx index e703a7333..41e1b40a9 100644 --- a/ui/js/component/fileCard/view.jsx +++ b/ui/js/component/fileCard/view.jsx @@ -97,21 +97,21 @@ class FileCard extends React.PureComponent { {description} - {obscureNsfw && this.state.hovered - ?
-

- {__( - "This content is Not Safe For Work. To view adult content, please change your" - )} - {" "} - navigate("settings")} - label={__("Settings")} - />. -

-
- : null} + {obscureNsfw && + this.state.hovered && +
+

+ {__( + "This content is Not Safe For Work. To view adult content, please change your" + )} + {" "} + navigate("settings")} + label={__("Settings")} + />. +

+
} ); diff --git a/ui/js/component/fileTile/view.jsx b/ui/js/component/fileTile/view.jsx index d19ce0137..09a4363ad 100644 --- a/ui/js/component/fileTile/view.jsx +++ b/ui/js/component/fileTile/view.jsx @@ -124,21 +124,20 @@ class FileTile extends React.PureComponent { - {this.state.showNsfwHelp - ?
-

- {__( - "This content is Not Safe For Work. To view adult content, please change your" - )} - {" "} - navigate("/settings")} - label={__("Settings")} - />. -

-
- : null} + {this.state.showNsfwHelp && +
+

+ {__( + "This content is Not Safe For Work. To view adult content, please change your" + )} + {" "} + navigate("/settings")} + label={__("Settings")} + />. +

+
} ); }