From 8e1da8c19087767bce9c0192a47c9983c2c0eba4 Mon Sep 17 00:00:00 2001 From: "Frank A. Krueger" Date: Thu, 15 Jun 2017 21:27:15 -0700 Subject: [PATCH] Add convenience Call ctor for Message --- Ooui/EventTarget.cs | 7 +------ Ooui/Message.cs | 7 +++++++ Ooui/UI.cs | 8 ++------ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/Ooui/EventTarget.cs b/Ooui/EventTarget.cs index 1ef9e10..99d71d5 100644 --- a/Ooui/EventTarget.cs +++ b/Ooui/EventTarget.cs @@ -108,12 +108,7 @@ namespace Ooui protected void SendCall (string methodName, params object[] args) { - Send (new Message { - MessageType = MessageType.Call, - TargetId = Id, - Key = methodName, - Value = args, - }); + Send (Message.Call (Id, methodName, args)); } protected void SendSet (string attributeName, object value) diff --git a/Ooui/Message.cs b/Ooui/Message.cs index 6fe19b9..b8d24af 100644 --- a/Ooui/Message.cs +++ b/Ooui/Message.cs @@ -22,6 +22,13 @@ namespace Ooui [JsonProperty("v")] public object Value = null; + public static Message Call (string targetId, string method, params object[] args) => new Message { + MessageType = MessageType.Call, + TargetId = targetId, + Key = method, + Value = args, + }; + public static Message Event (string targetId, string eventType) => new Message { MessageType = MessageType.Event, TargetId = targetId, diff --git a/Ooui/UI.cs b/Ooui/UI.cs index f3b62d5..70fd545 100644 --- a/Ooui/UI.cs +++ b/Ooui/UI.cs @@ -353,12 +353,8 @@ namespace Ooui // // Add it to the document body // - await SendMessageAsync (webSocket, new Message { - TargetId = "document.body", - MessageType = MessageType.Call, - Key = "appendChild", - Value = new[] { element }, - }, element, createdIds, token).ConfigureAwait (false); + await SendMessageAsync (webSocket, Message.Call ("document.body", "appendChild", element), + element, createdIds, token).ConfigureAwait (false); // // Listen for events