UI Extender is working

Author: nakosung

Content/Scripts/editor.js

@@ -45,13 +45,20 @@
 		module.exports = () => {
 			try {
 				let cleanup = main()
+
+				global.$$exit = cleanup
+		
 				return () => cleanup()
 			} catch (e) {
 				console.error(String(e))
 				return () => {}
 			}			
 		}
 	} else {
+		global.$$exit = function() {}
+		global.$exit = function () {
+			global.$$exit()
+		}
 		Context.WriteDTS(Context.Paths[0] + 'typings/ue.d.ts')
 		Context.WriteAliases(Context.Paths[0] + 'aliases.js')
 

Source/JavascriptEditor/JavascriptEditor.cpp

@@ -179,6 +179,7 @@ void FJavascriptEditorModule::Unregister()
 	for (auto e : Extensions) { e->Unregister(); }
 	Extensions.Empty();
 
+	JavascriptContext->RunScript(TEXT("this['$exit'] && this['$exit']()"));
 	JavascriptContext->RunScript(TEXT("gc()"));
 
 	JavascriptContext->JavascriptContext.Reset();

Source/JavascriptUMG/JavascriptMenuLibrary.cpp

@@ -167,35 +167,32 @@ FJavascriptUICommandInfo UJavascriptMenuLibrary::UI_COMMAND_Function(FJavascript
 
 FJavascriptExtensionBase UJavascriptMenuLibrary::AddToolBarExtension(FJavascriptExtender Extender, FName ExtensionHook, EJavascriptExtensionHook::Type HookPosition, FJavascriptUICommandList CommandList, FJavascriptFunction Function)
 {
-	auto Copy = new FJavascriptFunction;
-	*Copy = Function;
+	TSharedPtr<FJavascriptFunction> Copy(new FJavascriptFunction);
+	*(Copy.Get()) = Function;
 	return { Extender->AddToolBarExtension(ExtensionHook, (EExtensionHook::Position)HookPosition, CommandList.Handle, FToolBarExtensionDelegate::CreateLambda([=](class FToolBarBuilder& Builder) {
 		FJavascriptMenuBuilder Out;
 		Out.MultiBox = Out.ToolBar = &Builder;
 		Copy->Execute(FJavascriptMenuBuilder::StaticStruct(), &Out);
-		delete Copy;
 	}))};
 }
 FJavascriptExtensionBase UJavascriptMenuLibrary::AddMenuExtension(FJavascriptExtender Extender, FName ExtensionHook, EJavascriptExtensionHook::Type HookPosition, FJavascriptUICommandList CommandList, FJavascriptFunction Function)
 {
-	auto Copy = new FJavascriptFunction;
-	*Copy = Function;
+	TSharedPtr<FJavascriptFunction> Copy(new FJavascriptFunction);
+	*(Copy.Get()) = Function;
 	return{ Extender->AddMenuExtension(ExtensionHook, (EExtensionHook::Position)HookPosition, CommandList.Handle, FMenuExtensionDelegate::CreateLambda([=](class FMenuBuilder& Builder) {
 		FJavascriptMenuBuilder Out;
 		Out.MultiBox = Out.Menu = &Builder;
 		Copy->Execute(FJavascriptMenuBuilder::StaticStruct(), &Out);
-		delete Copy;
 	})) };
 }
 FJavascriptExtensionBase UJavascriptMenuLibrary::AddMenubarExtension(FJavascriptExtender Extender, FName ExtensionHook, EJavascriptExtensionHook::Type HookPosition, FJavascriptUICommandList CommandList, FJavascriptFunction Function)
 {
-	auto Copy = new FJavascriptFunction;
-	*Copy = Function;
+	TSharedPtr<FJavascriptFunction> Copy(new FJavascriptFunction);
+	*(Copy.Get()) = Function;
 	return{ Extender->AddMenuBarExtension(ExtensionHook, (EExtensionHook::Position)HookPosition, CommandList.Handle, FMenuBarExtensionDelegate::CreateLambda([=](class FMenuBarBuilder& Builder) {
 		FJavascriptMenuBuilder Out;
 		Out.MultiBox = Out.MenuBar = &Builder;
 		Copy->Execute(FJavascriptMenuBuilder::StaticStruct(), &Out);
-		delete Copy;
 	})) };
 }
 
@@ -236,4 +233,19 @@ FJavascriptExtender::FJavascriptExtender()
 
 FJavascriptExtender::FJavascriptExtender(TSharedPtr<FExtender> Extender)
 	: Handle(Extender)
-{}
+{}
+
+void UJavascriptMenuLibrary::AddPullDownMenu(FJavascriptMenuBuilder& MenuBuilder, const FText& InMenuLabel, const FText& InToolTip, FJavascriptFunction InPullDownMenu, FName InExtensionHook, FName InTutorialHighlightName)
+{
+	if (MenuBuilder.MenuBar)
+	{
+		TSharedPtr<FJavascriptFunction> Copy(new FJavascriptFunction);
+		*(Copy.Get()) = InPullDownMenu;
+		auto Delegate = FNewMenuDelegate::CreateLambda([=](class FMenuBuilder& Builder) {
+			FJavascriptMenuBuilder Out;
+			Out.MultiBox = Out.Menu = &Builder;
+			Copy->Execute(FJavascriptMenuBuilder::StaticStruct(), &Out);			
+		});
+		MenuBuilder.MenuBar->AddPullDownMenu(InMenuLabel, InToolTip, Delegate, InExtensionHook, InTutorialHighlightName);
+	}
+}

Source/JavascriptUMG/JavascriptMenuLibrary.h

@@ -186,6 +186,9 @@ class JAVASCRIPTUMG_API UJavascriptMenuLibrary : public UBlueprintFunctionLibrar
 	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
 	static void PopCommandList(FJavascriptMenuBuilder& Builder);
 
+	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
+	static void AddPullDownMenu(FJavascriptMenuBuilder& MenuBuilder, const FText& InMenuLabel, const FText& InToolTip, FJavascriptFunction InPullDownMenu, FName InExtensionHook, FName InTutorialHighlightName);
+
 	UFUNCTION(BlueprintCallable, Category = "Scripting | Javascript")
 	static FJavascriptBindingContext NewBindingContext(const FName InContextName, const FText& InContextDesc, const FName InContextParent, const FName InStyleSetName);