Skip to content

Commit 698b881

Browse files
author
Loïc Mangeonjean
committed
fix: properly detect element in sandbox mode
1 parent e54f2fb commit 698b881

5 files changed

Lines changed: 6 additions & 6 deletions

vscode-patches/0061-feat-support-shadow-dom.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ Subject: [PATCH] feat: support shadow dom
5353
46 files changed, 186 insertions(+), 100 deletions(-)
5454

5555
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
56-
index be401204e06..b110cb2b742 100644
56+
index be401204e06..adfb9f657ae 100644
5757
--- a/src/vs/base/browser/dom.ts
5858
+++ b/src/vs/base/browser/dom.ts
5959
@@ -165,6 +165,39 @@ export function addDisposableListener(node: EventTarget, type: string, handler:
@@ -79,7 +79,7 @@ index be401204e06..b110cb2b742 100644
7979
+ this.activeElement = getActiveElement(this.window.document);
8080
+ this._onDidChangeActiveElement.fire(this.activeElement);
8181
+
82-
+ if (e.target instanceof Element && e.target.shadowRoot) {
82+
+ if (isElement(e.target) && e.target.shadowRoot) {
8383
+ const disposableStore = new DisposableStore();
8484
+ disposableStore.add(addDisposableListener(e.target.shadowRoot, EventType.FOCUS_IN, this._onFocusIn));
8585
+ disposableStore.add(addDisposableListener(e.target, EventType.FOCUS_OUT, () => {

vscode-patches/0067-feat-prevent-IDE-from-entering-fullscreen-if-not-occ.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Subject: [PATCH] feat: prevent IDE from entering fullscreen if not occupying
1111
3 files changed, 11 insertions(+), 7 deletions(-)
1212

1313
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
14-
index b110cb2b742..278424505eb 100644
14+
index adfb9f657ae..6195106e703 100644
1515
--- a/src/vs/base/browser/dom.ts
1616
+++ b/src/vs/base/browser/dom.ts
1717
@@ -1699,11 +1699,13 @@ export interface IDetectedFullscreen {

vscode-patches/0068-feat-support-loading-VSCode-in-an-iframe.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Subject: [PATCH] feat: support loading VSCode in an iframe
1515
8 files changed, 45 insertions(+), 43 deletions(-)
1616

1717
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
18-
index 278424505eb..f3bb5a8352b 100644
18+
index 6195106e703..69a03f6a062 100644
1919
--- a/src/vs/base/browser/dom.ts
2020
+++ b/src/vs/base/browser/dom.ts
2121
@@ -1050,68 +1050,55 @@ function createHeadElement<K extends keyof HTMLElementTagNameMap>(tagName: K, co

vscode-patches/0069-feat-mark-elements-created-outside-of-the-VSCode-con.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Subject: [PATCH] feat: mark elements created outside of the VSCode container
99
2 files changed, 2 insertions(+)
1010

1111
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
12-
index f3bb5a8352b..0a22d593f8c 100644
12+
index 69a03f6a062..53fc806dcda 100644
1313
--- a/src/vs/base/browser/dom.ts
1414
+++ b/src/vs/base/browser/dom.ts
1515
@@ -1045,6 +1045,7 @@ export function createLinkElement(container: HTMLElement = mainWindow.document.h

vscode-patches/0070-feat-centralize-element-creation-to-be-able-to-creat.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -198,7 +198,7 @@ Subject: [PATCH] feat: centralize element creation, to be able to create them
198198
190 files changed, 648 insertions(+), 570 deletions(-)
199199

200200
diff --git a/src/vs/base/browser/dom.ts b/src/vs/base/browser/dom.ts
201-
index 0a22d593f8c..d7f1d8a5d1b 100644
201+
index 53fc806dcda..9932da557fa 100644
202202
--- a/src/vs/base/browser/dom.ts
203203
+++ b/src/vs/base/browser/dom.ts
204204
@@ -1043,13 +1043,43 @@ export function createLinkElement(container: HTMLElement = mainWindow.document.h

0 commit comments

Comments
 (0)