2 files changed, 18 insertions, 24 deletions
diff --git a/platform/javascript/js/libs/library_godot_display.js b/platform/javascript/js/libs/library_godot_display.js
index 2977b7c122..7b085aebc8 100644
--- a/platform/javascript/js/libs/library_godot_display.js
+++ b/platform/javascript/js/libs/library_godot_display.js
@@ -619,6 +619,18 @@ const GodotDisplay = {
 		GodotDisplayListeners.add(canvas, 'drop', GodotDisplayDragDrop.handler(dropFiles));
 	},
 
+	godot_js_display_setup_canvas__sig: 'v',
+	godot_js_display_setup_canvas: function () {
+		const canvas = GodotConfig.canvas;
+		GodotDisplayListeners.add(canvas, 'contextmenu', function (ev) {
+			ev.preventDefault();
+		}, false);
+		GodotDisplayListeners.add(canvas, 'webglcontextlost', function (ev) {
+			alert('WebGL context lost, please reload the page'); // eslint-disable-line no-alert
+			ev.preventDefault();
+		}, false);
+	},
+
 	/*
 	 * Gamepads
 	 */
diff --git a/platform/javascript/js/libs/library_godot_http_request.js b/platform/javascript/js/libs/library_godot_http_request.js
index 930d3209f8..7dc2a2df29 100644
--- a/platform/javascript/js/libs/library_godot_http_request.js
+++ b/platform/javascript/js/libs/library_godot_http_request.js
@@ -82,31 +82,13 @@ const GodotHTTPRequest = {
 		GodotHTTPRequest.requests[xhrId].setRequestHeader(GodotRuntime.parseString(header), GodotRuntime.parseString(value));
 	},
 
-	godot_xhr_send_null__sig: 'vi',
-	godot_xhr_send_null: function (xhrId) {
-		GodotHTTPRequest.requests[xhrId].send();
-	},
-
-	godot_xhr_send_string__sig: 'vii',
-	godot_xhr_send_string: function (xhrId, strPtr) {
-		if (!strPtr) {
-			GodotRuntime.error('Failed to send string per XHR: null pointer');
-			return;
-		}
-		GodotHTTPRequest.requests[xhrId].send(GodotRuntime.parseString(strPtr));
-	},
-
-	godot_xhr_send_data__sig: 'viii',
-	godot_xhr_send_data: function (xhrId, ptr, len) {
-		if (!ptr) {
-			GodotRuntime.error('Failed to send data per XHR: null pointer');
-			return;
-		}
-		if (len < 0) {
-			GodotRuntime.error('Failed to send data per XHR: buffer length less than 0');
-			return;
+	godot_xhr_send__sig: 'viii',
+	godot_xhr_send: function (xhrId, p_ptr, p_len) {
+		let data = null;
+		if (p_ptr && p_len) {
+			data = GodotRuntime.heapCopy(HEAP8, p_ptr, p_len);
 		}
-		GodotHTTPRequest.requests[xhrId].send(HEAPU8.subarray(ptr, ptr + len));
+		GodotHTTPRequest.requests[xhrId].send(data);
 	},
 
 	godot_xhr_abort__sig: 'vi',