diff options
author | Vijay A <avijayr@protonmail.com> | 2021-08-24 10:22:22 +0530 |
---|---|---|
committer | Vijay A <avijayr@protonmail.com> | 2021-08-24 10:22:22 +0530 |
commit | 2dc7b2fd3976853f3dc2f182f12cfe11c3b83688 (patch) | |
tree | 22fc7a9e4d3ddd2be16821c871259fb067c7df30 /src/components/services/tabs/TabItem.js | |
parent | docs: upgraded version to 5.6.1-beta.1 (diff) | |
parent | 5.6.1-nightly.37 [skip ci] (diff) | |
download | ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.tar.gz ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.tar.zst ferdium-app-2dc7b2fd3976853f3dc2f182f12cfe11c3b83688.zip |
Merge remote-tracking branch 'origin/develop' into release
Diffstat (limited to 'src/components/services/tabs/TabItem.js')
-rw-r--r-- | src/components/services/tabs/TabItem.js | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/components/services/tabs/TabItem.js b/src/components/services/tabs/TabItem.js index 6a6d2c8c5..6ad925670 100644 --- a/src/components/services/tabs/TabItem.js +++ b/src/components/services/tabs/TabItem.js | |||
@@ -10,7 +10,7 @@ import ms from 'ms'; | |||
10 | 10 | ||
11 | import { observable, autorun } from 'mobx'; | 11 | import { observable, autorun } from 'mobx'; |
12 | import ServiceModel from '../../../models/Service'; | 12 | import ServiceModel from '../../../models/Service'; |
13 | import { shortcutKey } from '../../../environment'; | 13 | import { cmdOrCtrlShortcutKey } from '../../../environment'; |
14 | 14 | ||
15 | const IS_SERVICE_DEBUGGING_ENABLED = ( | 15 | const IS_SERVICE_DEBUGGING_ENABLED = ( |
16 | localStorage.getItem('debug') || '' | 16 | localStorage.getItem('debug') || '' |
@@ -201,7 +201,7 @@ class TabItem extends Component { | |||
201 | { | 201 | { |
202 | label: intl.formatMessage(messages.reload), | 202 | label: intl.formatMessage(messages.reload), |
203 | click: reload, | 203 | click: reload, |
204 | accelerator: `${shortcutKey()}+R`, | 204 | accelerator: `${cmdOrCtrlShortcutKey()}+R`, |
205 | }, | 205 | }, |
206 | { | 206 | { |
207 | label: intl.formatMessage(messages.edit), | 207 | label: intl.formatMessage(messages.edit), |
@@ -307,7 +307,7 @@ class TabItem extends Component { | |||
307 | onClick={clickHandler} | 307 | onClick={clickHandler} |
308 | onContextMenu={() => menu.popup(getCurrentWindow())} | 308 | onContextMenu={() => menu.popup(getCurrentWindow())} |
309 | data-tip={`${service.name} ${ | 309 | data-tip={`${service.name} ${ |
310 | shortcutIndex <= 9 ? `(${shortcutKey(false)}+${shortcutIndex})` : '' | 310 | shortcutIndex <= 9 ? `(${cmdOrCtrlShortcutKey(false)}+${shortcutIndex})` : '' |
311 | }`} | 311 | }`} |
312 | > | 312 | > |
313 | <img src={service.icon} className="tab-item__icon" alt="" /> | 313 | <img src={service.icon} className="tab-item__icon" alt="" /> |