From fae2eda6837fe7c84bcbbc49e5063f43ecd16b4e Mon Sep 17 00:00:00 2001 From: Alexey Kasyanchuk Date: Thu, 2 Feb 2017 13:19:21 +0300 Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D0=B5=D1=81=D1=81=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BF=D0=BE?= =?UTF-8?q?=D1=81=D0=B5=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B4=D1=80=D1=83?= =?UTF-8?q?=D0=B3=D0=B8=D1=85=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/search.js | 46 +++++++++++++++++++++++++++++++++++++--------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/src/search.js b/src/search.js index da91d96..f9f6b18 100644 --- a/src/search.js +++ b/src/search.js @@ -11,6 +11,8 @@ import VisibilityOff from 'material-ui/svg-icons/action/visibility-off'; import formatBytes from './format-bytes' +let session; + export default class Search extends Component { constructor(props) { @@ -23,6 +25,17 @@ export default class Search extends Component { moreFilesIndicator: false, } this.searchLimit = 10 + + if(session) + { + this.searchTorrents = session.searchTorrents; + this.searchFiles = session.searchFiles; + this.moreSearchTorrents = session.moreSearchTorrents; + this.moreSearchFiles = session.moreSearchFiles; + this.currentSearch = session.currentSearch; + this.searchValue = session.searchValue; + Object.assign(this.state, this.setSafeSearch(session.notSafeSearch)) + } } search() { @@ -134,6 +147,27 @@ export default class Search extends Component { { if(this.newStatisticFunc) window.torrentSocket.off('newStatistic', this.newStatisticFunc); + + session = { + searchTorrents: this.searchTorrents, + searchFiles: this.searchFiles, + moreSearchTorrents: this.moreSearchTorrents, + moreSearchFiles: this.moreSearchFiles, + currentSearch: this.currentSearch, + searchValue: this.searchValue, + notSafeSearch: this.notSafeSearch, + } + } + setSafeSearch(ch) { + this.notSafeSearch = ch; + if(ch) + { + return {safeSearchText: 'safe search disabled', safeSearchColor: '#EC407A'} + } + else + { + return {safeSearchText: 'safe search enabled', safeSearchColor: 'rgb(0, 188, 212)'} + } } render() { const style = { @@ -151,6 +185,7 @@ export default class Search extends Component { floatingLabelText="What to search?" fullWidth={true} ref='searchInput' + defaultValue={this.searchValue} onKeyPress={(e) => { if (e.key === 'Enter') { this.search(); @@ -165,20 +200,13 @@ export default class Search extends Component {
} uncheckedIcon={} label={{this.state.safeSearchText}} iconStyle={{fill: this.state.safeSearchColor}} onCheck={(ev, ch) => { - this.notSafeSearch = ch; - if(ch) - { - this.setState({safeSearchText: 'safe search disabled', safeSearchColor: '#EC407A'}); - } - else - { - this.setState({safeSearchText: 'safe search enabled', safeSearchColor: 'rgb(0, 188, 212)'}); - } + this.setState(this.setSafeSearch(ch)); }} style={{paddingBottom: '0.8em'}} />