7 files changed, 14 insertions, 11 deletions
diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp
index a0e1246c55..2caf369354 100644
--- a/platform/javascript/display_server_javascript.cpp
+++ b/platform/javascript/display_server_javascript.cpp
@@ -28,7 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
-#include "platform/javascript/display_server_javascript.h"
+#include "display_server_javascript.h"
 
 #ifdef GLES3_ENABLED
 #include "drivers/gles3/rasterizer_gles3.h"
@@ -325,12 +325,13 @@ void DisplayServerJavaScript::cursor_set_custom_image(const RES &p_cursor, Curso
 
 		image = image->duplicate();
 
-		if (atlas_texture.is_valid())
+		if (atlas_texture.is_valid()) {
 			image->crop_from_point(
 					atlas_rect.position.x,
 					atlas_rect.position.y,
 					texture_size.width,
 					texture_size.height);
+		}
 
 		if (image->get_format() != Image::FORMAT_RGBA8) {
 			image->convert(Image::FORMAT_RGBA8);
@@ -618,8 +619,9 @@ void DisplayServerJavaScript::set_icon(const Ref<Image> &p_icon) {
 		ERR_FAIL_COND(icon->decompress() != OK);
 	}
 	if (icon->get_format() != Image::FORMAT_RGBA8) {
-		if (icon == p_icon)
+		if (icon == p_icon) {
 			icon = icon->duplicate();
+		}
 		icon->convert(Image::FORMAT_RGBA8);
 	}
 
@@ -891,8 +893,9 @@ Size2i DisplayServerJavaScript::window_get_real_size(WindowID p_window) const {
 }
 
 void DisplayServerJavaScript::window_set_mode(WindowMode p_mode, WindowID p_window) {
-	if (window_mode == p_mode)
+	if (window_mode == p_mode) {
 		return;
+	}
 
 	switch (p_mode) {
 		case WINDOW_MODE_WINDOWED: {
diff --git a/platform/javascript/export/export_plugin.cpp b/platform/javascript/export/export_plugin.cpp
index 8a1360e421..c7e503732d 100644
--- a/platform/javascript/export/export_plugin.cpp
+++ b/platform/javascript/export/export_plugin.cpp
@@ -31,7 +31,6 @@
 #include "export_plugin.h"
 
 #include "core/config/project_settings.h"
-#include "editor/editor_node.h"
 
 Error EditorExportPlatformJavaScript::_extract_template(const String &p_template, const String &p_dir, const String &p_name, bool pwa) {
 	FileAccess *src_f = nullptr;
@@ -645,7 +644,7 @@ Ref<Texture2D> EditorExportPlatformJavaScript::get_run_icon() const {
 void EditorExportPlatformJavaScript::_server_thread_poll(void *data) {
 	EditorExportPlatformJavaScript *ej = (EditorExportPlatformJavaScript *)data;
 	while (!ej->server_quit) {
-		OS::get_singleton()->delay_usec(1000);
+		OS::get_singleton()->delay_usec(6900);
 		{
 			MutexLock lock(ej->server_lock);
 			ej->server->poll();
diff --git a/platform/javascript/export/export_plugin.h b/platform/javascript/export/export_plugin.h
index 8d4307548c..d17fd2f674 100644
--- a/platform/javascript/export/export_plugin.h
+++ b/platform/javascript/export/export_plugin.h
@@ -37,14 +37,13 @@
 #include "core/io/tcp_server.h"
 #include "core/io/zip_io.h"
 #include "editor/editor_export.h"
+#include "editor/editor_node.h"
 #include "main/splash.gen.h"
 #include "platform/javascript/logo.gen.h"
 #include "platform/javascript/run_icon.gen.h"
 
 #include "export_server.h"
 
-class EditorNode;
-
 class EditorExportPlatformJavaScript : public EditorExportPlatform {
 	GDCLASS(EditorExportPlatformJavaScript, EditorExportPlatform);
 
diff --git a/platform/javascript/export/export_server.h b/platform/javascript/export/export_server.h
index 1380f34ad7..1b908ad9b0 100644
--- a/platform/javascript/export/export_server.h
+++ b/platform/javascript/export/export_server.h
@@ -36,7 +36,7 @@
 #include "core/io/tcp_server.h"
 #include "core/io/zip_io.h"
 #include "editor/editor_export.h"
-#include "editor/editor_node.h"
+#include "editor/editor_paths.h"
 
 class EditorHTTPServer : public RefCounted {
 private:
diff --git a/platform/javascript/javascript_main.cpp b/platform/javascript/javascript_main.cpp
index 5c00476a72..307a80feea 100644
--- a/platform/javascript/javascript_main.cpp
+++ b/platform/javascript/javascript_main.cpp
@@ -28,6 +28,7 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 
+#include "core/config/engine.h"
 #include "core/io/resource_loader.h"
 #include "main/main.h"
 #include "platform/javascript/display_server_javascript.h"
@@ -94,7 +95,7 @@ extern EMSCRIPTEN_KEEPALIVE int godot_js_main(int argc, char *argv[]) {
 	Main::start();
 	os->get_main_loop()->initialize();
 #ifdef TOOLS_ENABLED
-	if (Main::is_project_manager() && FileAccess::exists("/tmp/preload.zip")) {
+	if (Engine::get_singleton()->is_project_manager_hint() && FileAccess::exists("/tmp/preload.zip")) {
 		PackedStringArray ps;
 		ps.push_back("/tmp/preload.zip");
 		os->get_main_loop()->emit_signal(SNAME("files_dropped"), ps, -1);
diff --git a/platform/javascript/javascript_singleton.cpp b/platform/javascript/javascript_singleton.cpp
index 77858bff01..eb5c02822f 100644
--- a/platform/javascript/javascript_singleton.cpp
+++ b/platform/javascript/javascript_singleton.cpp
@@ -29,6 +29,7 @@
 /*************************************************************************/
 
 #include "api/javascript_singleton.h"
+
 #include "emscripten.h"
 #include "os_javascript.h"
 
diff --git a/platform/javascript/os_javascript.cpp b/platform/javascript/os_javascript.cpp
index de5ca44f9d..da88ea18b0 100644
--- a/platform/javascript/os_javascript.cpp
+++ b/platform/javascript/os_javascript.cpp
@@ -175,7 +175,7 @@ String OS_JavaScript::get_name() const {
 
 String OS_JavaScript::get_user_data_dir() const {
 	return "/userfs";
-};
+}
 
 String OS_JavaScript::get_cache_path() const {
 	return "/home/web_user/.cache";