diff --git a/browser/main/Main.js b/browser/main/Main.js index 52928598..2ebb06b7 100644 --- a/browser/main/Main.js +++ b/browser/main/Main.js @@ -37,7 +37,7 @@ class Main extends React.Component { mainBodyWidth: 0 } - this.fullScreenEditorCode = () => this.handleFullScreenButton() + this.toggleFullScreen = () => this.handleFullScreenButton() } getChildContext () { @@ -72,13 +72,13 @@ class Main extends React.Component { } }) - eventEmitter.on('editor:fullscreen', this.fullScreenEditorCode) + eventEmitter.on('editor:fullscreen', this.toggleFullScreen) window.addEventListener('focus', focused) } componentWillUnmount () { window.removeEventListener('focus', focused) - eventEmitter.off('editor:fullscreen', this.fullScreenEditorCode) + eventEmitter.off('editor:fullscreen', this.toggleFullScreen) } handleLeftSlideMouseDown (e) { @@ -159,24 +159,27 @@ class Main extends React.Component { this.setState({ fullScreen: !this.state.fullScreen }, () => { const noteDetail = document.querySelector('.NoteDetail') const mainBody = document.querySelector('#main-body') - const sliderRight = document.querySelector('#slider-right') - const sliderLeft = document.querySelector('#slider-left') + if (this.state.fullScreen) { - this.state.noteDetailWidth = noteDetail.style.left - this.state.mainBodyWidth = mainBody.style.left - noteDetail.style.left = '0px' - mainBody.style.left = '0px' - sliderRight.style.display = 'none' - sliderLeft.style.display = 'none' + this.hideLeftLists(noteDetail, mainBody) } else { - noteDetail.style.left = this.state.noteDetailWidth - mainBody.style.left = this.state.mainBodyWidth - sliderRight.style.display = 'block' - sliderLeft.style.display = 'block' + this.showLeftLists(noteDetail, mainBody) } }) } + hideLeftLists(noteDetail, mainBody) { + this.state.noteDetailWidth = noteDetail.style.left + this.state.mainBodyWidth = mainBody.style.left + noteDetail.style.left = '0px' + mainBody.style.left = '0px' + } + + showLeftLists(noteDetail, mainBody) { + noteDetail.style.left = this.state.noteDetailWidth + mainBody.style.left = this.state.mainBodyWidth + } + render () { let { config } = this.props @@ -198,7 +201,6 @@ class Main extends React.Component { /> {!config.isSideNavFolded &&
this.handleLeftSlideMouseDown(e)} draggable='false' @@ -230,7 +232,6 @@ class Main extends React.Component { ])} />
this.handleRightSlideMouseDown(e)} draggable='false' diff --git a/browser/main/Main.styl b/browser/main/Main.styl index 29f21f04..56505950 100644 --- a/browser/main/Main.styl +++ b/browser/main/Main.styl @@ -13,10 +13,12 @@ absolute top bottom top -2px width 0 + z-index 0 .slider-right @extend .slider width 1px + z-index 0 .slider--active @extend .slider