From 7f9f75704201d44cf731287b40e6cf284652c72e Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 11 Sep 2019 14:35:36 -0700 Subject: [PATCH 1/2] Fix web links addon support in Edge regex.flags isn't supported on Edge Fixes #2417 --- src/browser/Linkifier.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/browser/Linkifier.ts b/src/browser/Linkifier.ts index a5454ac5..53a32aa7 100644 --- a/src/browser/Linkifier.ts +++ b/src/browser/Linkifier.ts @@ -211,7 +211,7 @@ export class Linkifier implements ILinkifier { */ private _doLinkifyRow(rowIndex: number, text: string, matcher: ILinkMatcher): void { // clone regex to do a global search on text - const rex = new RegExp(matcher.regex.source, matcher.regex.flags + 'g'); + const rex = new RegExp(matcher.regex.source, (matcher.regex.flags || '') + 'g'); let match; let stringIndex = -1; while ((match = rex.exec(text)) !== null) { From e042f25b8d45ee250d1fcf9a9800053d67271420 Mon Sep 17 00:00:00 2001 From: Daniel Imms Date: Wed, 11 Sep 2019 08:51:01 -0700 Subject: [PATCH 2/2] Expose ctor at window.Terminal Fixes #2415 --- webpack.config.js | 1 - 1 file changed, 1 deletion(-) diff --git a/webpack.config.js b/webpack.config.js index 3f55dda3..a9a60241 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -35,7 +35,6 @@ module.exports = { output: { filename: 'xterm.js', path: path.resolve('./lib'), - library: 'Terminal', libraryTarget: 'umd' }, mode: 'production'