Merge pull request #2448 from jacobherrington/alt-hotkey-bug

Rokt33r · web-flow · commit 69691bdf2a43 · 2018-11-08T11:57:10.000+09:00
Fix bug caused by poor regex
diff --git a/browser/main/lib/ConfigManager.js b/browser/main/lib/ConfigManager.js
@@ -203,7 +203,7 @@ function rewriteHotkey (config) {
   const keys = [...Object.keys(config.hotkey)]
   keys.forEach(key => {
     config.hotkey[key] = config.hotkey[key].replace(/Cmd/g, 'Command')
-    config.hotkey[key] = config.hotkey[key].replace(/Opt/g, 'Alt')
+    config.hotkey[key] = config.hotkey[key].replace(/Opt\s/g, 'Option ')
   })
   return config
 }

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ function rewriteHotkey (config) {`
`203`	`203`	`const keys = [...Object.keys(config.hotkey)]`
`204`	`204`	`keys.forEach(key => {`
`205`	`205`	`config.hotkey[key] = config.hotkey[key].replace(/Cmd/g, 'Command')`
`206`		`- config.hotkey[key] = config.hotkey[key].replace(/Opt/g, 'Alt')`
	`206`	`+ config.hotkey[key] = config.hotkey[key].replace(/Opt\s/g, 'Option ')`
`207`	`207`	`})`
`208`	`208`	`return config`
`209`	`209`	`}`