diff --git a/browser/main/StatusBar/index.js b/browser/main/StatusBar/index.js index c99bf0367..ee5237c12 100644 --- a/browser/main/StatusBar/index.js +++ b/browser/main/StatusBar/index.js @@ -5,7 +5,7 @@ import styles from './StatusBar.styl' import ZoomManager from 'browser/main/lib/ZoomManager' import i18n from 'browser/lib/i18n' import context from 'browser/lib/context' -import EventEmitter from 'browser/main/lib/eventEmitter' +import eventEmitter from 'browser/main/lib/eventEmitter' const electron = require('electron') const { remote, ipcRenderer } = electron @@ -14,24 +14,16 @@ const { dialog } = remote const zoomOptions = [0.8, 0.9, 1, 1.1, 1.2, 1.3, 1.4, 1.5, 1.6, 1.7, 1.8, 1.9, 2.0] class StatusBar extends React.Component { - - constructor (props) { - super(props) - this.handleZoomInMenuItem = this.handleZoomInMenuItem.bind(this) - this.handleZoomOutMenuItem = this.handleZoomOutMenuItem.bind(this) - this.handleZoomResetMenuItem = this.handleZoomResetMenuItem.bind(this) - } - componentDidMount () { - EventEmitter.on('status:zoomin', this.handleZoomInMenuItem) - EventEmitter.on('status:zoomout', this.handleZoomOutMenuItem) - EventEmitter.on('status:zoomreset', this.handleZoomResetMenuItem) + this.handleZoomInBound = this.handleZoomIn.bind(this) + this.handleZoomOutBound = this.handleZoomOut.bind(this) + eventEmitter.on('statusbar:zoomin', this.handleZoomInBound) + eventEmitter.on('statusbar:zoomout', this.handleZoomOutBound) } componentWillUnmount () { - EventEmitter.off('status:zoomin', this.handleZoomInMenuItem) - EventEmitter.off('status:zoomout', this.handleZoomOutMenuItem) - EventEmitter.off('status:zoomreset', this.handleZoomResetMenuItem) + eventEmitter.off('statusbar:zoomin', this.handleZoomInBound) + eventEmitter.off('statusbar:zoomout', this.handleZoomOutBound) } updateApp () { @@ -47,6 +39,14 @@ class StatusBar extends React.Component { } } + handleZoomIn () { + this.handleZoomMenuItemClick(ZoomManager.getZoom() + 0.1) + } + + handleZoomOut () { + this.handleZoomMenuItemClick(ZoomManager.getZoom() - 0.1) + } + handleZoomButtonClick (e) { const templates = [] @@ -69,20 +69,6 @@ class StatusBar extends React.Component { }) } - handleZoomInMenuItem () { - const zoomFactor = ZoomManager.getZoom() + 0.1 - this.handleZoomMenuItemClick(zoomFactor) - } - - handleZoomOutMenuItem () { - const zoomFactor = ZoomManager.getZoom() - 0.1 - this.handleZoomMenuItemClick(zoomFactor) - } - - handleZoomResetMenuItem () { - this.handleZoomMenuItemClick(1.0) - } - render () { const { config, status } = this.context diff --git a/lib/main-menu.js b/lib/main-menu.js index 91f3c8c65..b4da1e6a3 100644 --- a/lib/main-menu.js +++ b/lib/main-menu.js @@ -309,25 +309,18 @@ const view = { { type: 'separator' }, - { - label: 'Actual Size', - accelerator: macOS ? 'CommandOrControl+0' : 'Control+0', - click () { - mainWindow.webContents.send('status:zoomreset') - } - }, { label: 'Zoom In', - accelerator: macOS ? 'CommandOrControl+=' : 'Control+=', + accelerator: 'CommandOrControl+=', click () { - mainWindow.webContents.send('status:zoomin') + mainWindow.webContents.send('statusbar:zoomin') } }, { label: 'Zoom Out', - accelerator: macOS ? 'CommandOrControl+-' : 'Control+-', + accelerator: 'CommandOrControl+-', click () { - mainWindow.webContents.send('status:zoomout') + mainWindow.webContents.send('statusbar:zoomout') } } ]