diff options
-rw-r--r-- | src/components/services/tabs/TabItem.js | 4 | ||||
-rw-r--r-- | src/features/workspaces/components/WorkspaceDrawerItem.js | 4 | ||||
-rw-r--r-- | src/webview/contextMenuBuilder.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 84cef8c0e..35224631e 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Menu, dialog, app, getCurrentWindow } from '@electron/remote'; | 1 | import { Menu, dialog, app } from '@electron/remote'; |
2 | import React, { Component } from 'react'; | 2 | import React, { Component } from 'react'; |
3 | import { defineMessages, injectIntl } from 'react-intl'; | 3 | import { defineMessages, injectIntl } from 'react-intl'; |
4 | import PropTypes from 'prop-types'; | 4 | import PropTypes from 'prop-types'; |
@@ -300,7 +300,7 @@ class TabItem extends Component { | |||
300 | 'is-disabled': !service.isEnabled, | 300 | 'is-disabled': !service.isEnabled, |
301 | })} | 301 | })} |
302 | onClick={clickHandler} | 302 | onClick={clickHandler} |
303 | onContextMenu={() => menu.popup(getCurrentWindow())} | 303 | onContextMenu={() => menu.popup()} |
304 | data-tip={`${service.name} ${ | 304 | data-tip={`${service.name} ${ |
305 | shortcutIndex <= 9 | 305 | shortcutIndex <= 9 |
306 | ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` | 306 | ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` |
diff --git a/src/features/workspaces/components/WorkspaceDrawerItem.js b/src/features/workspaces/components/WorkspaceDrawerItem.js index 7df2b60be..4afb9c108 100644 --- a/src/features/workspaces/components/WorkspaceDrawerItem.js +++ b/src/features/workspaces/components/WorkspaceDrawerItem.js | |||
@@ -1,4 +1,4 @@ | |||
1 | import { Menu, getCurrentWindow } from '@electron/remote'; | 1 | import { Menu } from '@electron/remote'; |
2 | import React, { Component } from 'react'; | 2 | import React, { Component } from 'react'; |
3 | import PropTypes from 'prop-types'; | 3 | import PropTypes from 'prop-types'; |
4 | import { observer } from 'mobx-react'; | 4 | import { observer } from 'mobx-react'; |
@@ -119,7 +119,7 @@ class WorkspaceDrawerItem extends Component { | |||
119 | ])} | 119 | ])} |
120 | onClick={onClick} | 120 | onClick={onClick} |
121 | onContextMenu={() => | 121 | onContextMenu={() => |
122 | onContextMenuEditClick && contextMenu.popup(getCurrentWindow()) | 122 | onContextMenuEditClick && contextMenu.popup() |
123 | } | 123 | } |
124 | data-tip={`${ | 124 | data-tip={`${ |
125 | shortcutIndex <= 9 | 125 | shortcutIndex <= 9 |
diff --git a/src/webview/contextMenuBuilder.js b/src/webview/contextMenuBuilder.js index eb15aa138..938eade1e 100644 --- a/src/webview/contextMenuBuilder.js +++ b/src/webview/contextMenuBuilder.js | |||
@@ -98,7 +98,7 @@ module.exports = class ContextMenuBuilder { | |||
98 | async showPopupMenu(contextInfo) { | 98 | async showPopupMenu(contextInfo) { |
99 | const menu = await this.buildMenuForElement(contextInfo); | 99 | const menu = await this.buildMenuForElement(contextInfo); |
100 | if (!menu) return; | 100 | if (!menu) return; |
101 | menu.popup({}); | 101 | menu.popup(); |
102 | } | 102 | } |
103 | 103 | ||
104 | /** | 104 | /** |