瀏覽代碼

As we're using the object and not the event helper to subscribe, subscribe/unsubscribe work as normal

Josh Engebretson 10 年之前
父節點
當前提交
5c8502a810
共有 3 個文件被更改,包括 5 次插入12 次删除
  1. 1 0
      Script/AtomicEditor/tsconfig.json
  2. 4 4
      Script/TypeScript/Atomic.d.ts
  3. 0 8
      Source/AtomicJS/Javascript/JSCore.cpp

+ 1 - 0
Script/AtomicEditor/tsconfig.json

@@ -20,6 +20,7 @@
         "./ui/EditorStrings.ts",
         "./ui/EditorStrings.ts",
         "./ui/EditorUI.ts",
         "./ui/EditorUI.ts",
         "./ui/HierarchyFrame.ts",
         "./ui/HierarchyFrame.ts",
+        "./ui/HierarchyFrameMenu.ts",
         "./ui/MainFrame.ts",
         "./ui/MainFrame.ts",
         "./ui/MainFrameMenu.ts",
         "./ui/MainFrameMenu.ts",
         "./ui/MainToolbar.ts",
         "./ui/MainToolbar.ts",

+ 4 - 4
Script/TypeScript/Atomic.d.ts

@@ -1456,6 +1456,10 @@ declare module Atomic {
       getBaseType(): string;
       getBaseType(): string;
       // Return type name.
       // Return type name.
       getTypeName(): string;
       getTypeName(): string;
+      // Unsubscribe from a specific sender's events.
+      unsubscribeFromEvents(sender: AObject): void;
+      // Unsubscribe from all events.
+      unsubscribeFromAllEvents(): void;
       // Return execution context.
       // Return execution context.
       getContext(): Context;
       getContext(): Context;
       // Return subsystem by type.
       // Return subsystem by type.
@@ -1471,10 +1475,6 @@ declare module Atomic {
       sendEvent(eventType:string, data?:Object);
       sendEvent(eventType:string, data?:Object);
       subscribeToEvent(eventType:string, callback:(data:any)=>void);
       subscribeToEvent(eventType:string, callback:(data:any)=>void);
       subscribeToEvent(sender:AObject, eventType:string, callback:(data:any)=>void);
       subscribeToEvent(sender:AObject, eventType:string, callback:(data:any)=>void);
-      unsubscribeFromAllEvents();
-      unsubscribeFromEvent(event:String);
-      unsubscribeFromEvents(sender:Atomic.AObject);
-      unsubscribeFromSenderEvent(sender:Atomic.AObject, event:String);
 
 
    }
    }
 
 

+ 0 - 8
Source/AtomicJS/Javascript/JSCore.cpp

@@ -113,14 +113,6 @@ static int Object_SendEvent(duk_context* ctx)
 
 
 }
 }
 
 
-/*
-"unsubscribeFromAllEvents();",
-"unsubscribeFromEvent(event:String);",
-"unsubscribeFromEvents(sender:Atomic.AObject);",
-"unsubscribeFromSenderEvent(sender:Atomic.AObject, event:String);"
-*/
-
-
 static int Atomic_GetArguments(duk_context* ctx)
 static int Atomic_GetArguments(duk_context* ctx)
 {
 {
     duk_push_array(ctx);
     duk_push_array(ctx);