Merge pull request #616 from CodinGame/fix-webviews

Move webview html next to service worker

Author: CGNonofr

src/assets/webview/index-no-csp.html renamed to src/override/vs/workbench/contrib/webview/browser/pre/index-no-csp.html

@@ -5,7 +5,7 @@
 	<meta charset="UTF-8">
 
 	<meta http-equiv="Content-Security-Policy"
-		content="default-src 'none'; script-src 'sha256-arx+BFQ6Ai8KfBjyq5yCRLgjx4ziWirnD8/yRHgGrVc=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
+		content="default-src 'none'; script-src 'sha256-pTZgf/zU+f1azdy9x9B5BfoQYdrPJWvIfvvlF2+dasY=' 'self'; frame-src 'self'; style-src 'unsafe-inline';">
 
 	<!-- Disable pinch zooming -->
 	<meta name="viewport"
@@ -771,13 +771,27 @@
 
 
 		function handleInnerDragEvent(/** @type {DragEvent} */ e) {
+			/**
+			 * To ensure that the drop event always fires as expected, you should always include a preventDefault() call in the part of your code which handles the dragover event.
+			 * source: https://developer.mozilla.org/en-US/docs/Web/API/HTMLElement/drop_event
+			 **/
+			e.preventDefault();
+
 			if (!e.dataTransfer) {
 				return;
 			}
 
-			hostMessaging.postMessage('drag', {
-				shiftKey: e.shiftKey
-			});
+
+			// Only handle drags from outside editor for now
+			if (e.dataTransfer.items.length && Array.prototype.every.call(e.dataTransfer.items, item => item.kind === 'file')) {
+				hostMessaging.postMessage('drag', {
+					shiftKey: e.shiftKey
+				});
+			}
+		}
+
+		function handleInnerDropEvent(/**@type {DragEvent} */e) {
+			e.preventDefault();
 		}
 
 		/**
@@ -872,6 +886,7 @@
 		window.addEventListener('dragenter', handleInnerDragStartEvent);
 		window.addEventListener('dragover', handleInnerDragEvent);
 		window.addEventListener('drag', handleInnerDragEvent);
+		window.addEventListener('drop', handleInnerDropEvent);
 
 		onDomReady(() => {
 			if (!document.body) {

src/assets/webview/index.html renamed to src/override/vs/workbench/contrib/webview/browser/pre/index.html

@@ -74,28 +74,22 @@ let webviewIframeAlternateDomains: string | undefined
 registerAssets({
   'vs/workbench/contrib/webview/browser/pre/service-worker.js': () =>
     changeUrlDomain(
-      new URL(
-        '../../vscode/src/vs/workbench/contrib/webview/browser/pre/service-worker.js',
-        import.meta.url
-      ).href,
+      new URL('vs/workbench/contrib/webview/browser/pre/service-worker.js', import.meta.url).href,
       webviewIframeAlternateDomains
     ),
   'vs/workbench/contrib/webview/browser/pre/index.html': () =>
     changeUrlDomain(
-      new URL('../assets/webview/index.html', import.meta.url).href,
+      new URL('vs/workbench/contrib/webview/browser/pre/index.html', import.meta.url).href,
       webviewIframeAlternateDomains
     ),
   'vs/workbench/contrib/webview/browser/pre/index-no-csp.html': () =>
     changeUrlDomain(
-      new URL('../assets/webview/index-no-csp.html', import.meta.url).href,
+      new URL('vs/workbench/contrib/webview/browser/pre/index-no-csp.html', import.meta.url).href,
       webviewIframeAlternateDomains
     ),
   'vs/workbench/contrib/webview/browser/pre/fake.html': () =>
     changeUrlDomain(
-      new URL(
-        '../../vscode/src/vs/workbench/contrib/webview/browser/pre/fake.html',
-        import.meta.url
-      ).href,
+      new URL('vs/workbench/contrib/webview/browser/pre/fake.html', import.meta.url).href,
       webviewIframeAlternateDomains
     )
 })