Compare commits
2 Commits
1.32.0-275
...
1.32.0-282
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2f27b5df8c | ||
|
|
400fba7f6f |
@@ -46,7 +46,9 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
|
|||||||
return oldSrc!.get!.call(img);
|
return oldSrc!.get!.call(img);
|
||||||
},
|
},
|
||||||
set: (value: string): void => {
|
set: (value: string): void => {
|
||||||
value = value.replace(/file:\/\//g, "/resource");
|
if (value) {
|
||||||
|
value = value.replace(/file:\/\//g, "/resource");
|
||||||
|
}
|
||||||
oldSrc!.set!.call(img, value);
|
oldSrc!.set!.call(img, value);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
@@ -65,7 +67,9 @@ const newCreateElement = <K extends keyof HTMLElementTagNameMap>(tagName: K): HT
|
|||||||
return oldInnerHtml!.get!.call(style);
|
return oldInnerHtml!.get!.call(style);
|
||||||
},
|
},
|
||||||
set: (value: string): void => {
|
set: (value: string): void => {
|
||||||
value = value.replace(/file:\/\//g, "/resource");
|
if (value) {
|
||||||
|
value = value.replace(/file:\/\//g, "/resource");
|
||||||
|
}
|
||||||
oldInnerHtml!.set!.call(style, value);
|
oldInnerHtml!.set!.call(style, value);
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -349,6 +349,14 @@ index 58ba2e5..4fb6272 100644
|
|||||||
@@ -774 +774 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti
|
@@ -774 +774 @@ function loadCommonJSModule<T>(logService: ILogService, modulePath: string, acti
|
||||||
- r = require.__$__nodeRequire<T>(modulePath);
|
- r = require.__$__nodeRequire<T>(modulePath);
|
||||||
+ r = (global as any).nativeNodeRequire(modulePath);
|
+ r = (global as any).nativeNodeRequire(modulePath);
|
||||||
|
diff --git a/src/vs/workbench/api/node/extHostTypeConverters.ts b/src/vs/workbench/api/node/extHostTypeConverters.ts
|
||||||
|
index a445750..c7beb13 100644
|
||||||
|
--- a/src/vs/workbench/api/node/extHostTypeConverters.ts
|
||||||
|
+++ b/src/vs/workbench/api/node/extHostTypeConverters.ts
|
||||||
|
@@ -26 +25,0 @@ import { ExtHostDocumentsAndEditors } from 'vs/workbench/api/node/extHostDocumen
|
||||||
|
-import { isString, isNumber } from 'vs/base/common/types';
|
||||||
|
@@ -116,0 +116 @@ export namespace Diagnostic {
|
||||||
|
+ const { isString, isNumber } = require('vs/base/common/types');
|
||||||
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
|
diff --git a/src/vs/workbench/browser/dnd.ts b/src/vs/workbench/browser/dnd.ts
|
||||||
index 5897ab9..57b926e 100644
|
index 5897ab9..57b926e 100644
|
||||||
--- a/src/vs/workbench/browser/dnd.ts
|
--- a/src/vs/workbench/browser/dnd.ts
|
||||||
|
|||||||
Reference in New Issue
Block a user