File tree 2 files changed +15
-4
lines changed
2 files changed +15
-4
lines changed Original file line number Diff line number Diff line change 1
1
import * as labels from "vs/base/common/labels" ;
2
2
3
- // Here we simply disable translation of mnemonics and leave everything as &&.
4
- // Since we're in the browser, we can handle all platforms in the same way.
3
+ // Disable all mnemonics for now until we implement it.
5
4
const target = labels as typeof labels ;
6
5
target . mnemonicMenuLabel = ( label : string , forceDisable ?: boolean ) : string => {
7
- return forceDisable ? label . replace ( / \( & & \w \) | & & / g, "" ) : label ;
6
+ return label . replace ( / \( & & \w \) | & & / g, "" ) ;
7
+ } ;
8
+ target . mnemonicButtonLabel = ( label : string ) : string => {
9
+ return label . replace ( / \( & & \w \) | & & / g, "" ) ;
8
10
} ;
9
- target . mnemonicButtonLabel = ( label : string ) : string => { return label ; } ;
10
11
target . unmnemonicLabel = ( label : string ) : string => { return label ; } ;
Original file line number Diff line number Diff line change @@ -46,6 +46,16 @@ index cd7312809c..b1246de1ee 100644
46
46
@@ -553 +553 @@ export class MouseController<T> implements IDisposable {
47
47
- return platform.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
48
48
+ return browser.isMacintosh ? event.browserEvent.metaKey : event.browserEvent.ctrlKey;
49
+ diff --git a/src/vs/base/browser/ui/menu/menu.ts b/src/vs/base/browser/ui/menu/menu.ts
50
+ index 47da5e4277..fbf7e22aed 100644
51
+ --- a/src/vs/base/browser/ui/menu/menu.ts
52
+ +++ b/src/vs/base/browser/ui/menu/menu.ts
53
+ @@ -23,2 +23,3 @@ import { isLinux } from 'vs/base/common/platform';
54
+ - export const MENU_MNEMONIC_REGEX: RegExp = /\(&([^\s&])\)|(?<!&)&([^\s&])/;
55
+ - export const MENU_ESCAPED_MNEMONIC_REGEX: RegExp = /(?<!&)(?:&)([^\s&])/;
56
+ + // Not all browsers support negative lookbehinds. We don't support mnemonics currently anyway.
57
+ + export const MENU_MNEMONIC_REGEX: RegExp = /&([^\s&])/; ///\(&([^\s&])\)|(?<!&)&([^\s&])/;
58
+ + export const MENU_ESCAPED_MNEMONIC_REGEX: RegExp = /&([^\s&])/; // /(?<!&)(?:&)([^\s&])/;
49
59
diff --git a/src/vs/base/browser/ui/sash/sash.ts b/src/vs/base/browser/ui/sash/sash.ts
50
60
index 8c7168bad5..8bbea63b3b 100644
51
61
--- a/src/vs/base/browser/ui/sash/sash.ts
You can’t perform that action at this time.
0 commit comments