Added special dom event instance

Author: FlorianRappl

AngleSharp.Scripting.JavaScript/AngleSharp.Scripting.JavaScript.csproj

@@ -54,6 +54,7 @@
     <Compile Include="ConsoleInstance.cs" />
     <Compile Include="DomConstructorInstance.cs" />
     <Compile Include="DomConstructors.cs" />
+    <Compile Include="DomEventInstance.cs" />
     <Compile Include="Dom\RequesterState.cs" />
     <Compile Include="Dom\XmlHttpRequest.cs" />
     <Compile Include="Dom\XmlHttpRequestEventTarget.cs" />

AngleSharp.Scripting.JavaScript/DomEventInstance.cs

@@ -0,0 +1,54 @@
+namespace AngleSharp.Scripting.JavaScript
+{
+    using AngleSharp.Dom;
+    using Jint.Native;
+    using Jint.Native.Function;
+    using Jint.Runtime.Interop;
+    using System.Reflection;
+
+    sealed class DomEventInstance
+    {
+        DomEventHandler _handler;
+        FunctionInstance _function;
+
+        public DomEventInstance(DomNodeInstance node, EventInfo eventInfo)
+        {
+            Getter = new ClrFunctionInstance(node.Engine, (thisObject, arguments) => _function ?? JsValue.Null);
+            Setter = new ClrFunctionInstance(node.Engine, (thisObject, arguments) =>
+            {
+                if (_handler != null)
+                {
+                    eventInfo.RemoveEventHandler(node.Value, _handler);
+                    _handler = null;
+                    _function = null;
+                }
+
+                if (arguments[0].Is<FunctionInstance>())
+                {
+                    _function = arguments[0].As<FunctionInstance>();
+                    _handler = (s, ev) => 
+                    {
+                        var sender = s.ToJsValue(node.Context);
+                        var args = ev.ToJsValue(node.Context);
+                        _function.Call(sender, new [] { args });
+                    };
+                    eventInfo.AddEventHandler(node.Value, _handler);
+                }
+
+                return arguments[0];
+            });
+        }
+
+        public ClrFunctionInstance Getter
+        {
+            get;
+            private set;
+        }
+
+        public ClrFunctionInstance Setter
+        {
+            get;
+            private set;
+        }
+    }
+}

AngleSharp.Scripting.JavaScript/DomNodeInstance.cs

@@ -35,9 +35,9 @@ public EngineInstance Context
         public override PropertyDescriptor GetOwnProperty(String propertyName)
         {
             //  If we have a numeric indexer and the property is numeric
-            int numericIndex;
+            var numericIndex = default(Int32);
 
-            if (_numericIndexer != null && int.TryParse(propertyName, out numericIndex))
+            if (_numericIndexer != null && Int32.TryParse(propertyName, out numericIndex))
                 return new PropertyDescriptor(_numericIndexer.GetMethod.Invoke(_value, new Object[] { numericIndex }).ToJsValue(_engine), false, false, false);
 
             //  Else a string property
@@ -46,8 +46,8 @@ public override PropertyDescriptor GetOwnProperty(String propertyName)
             //  Eg. object.callMethod1()  vs  object['callMethod1'] is not necessarily the same if the object has a string indexer?? (I'm not an ECMA expert!)
             //  node.attributes is one such object - has both a string and numeric indexer
             //  This GetOwnProperty override might need an additional parameter to let us know this was called via an indexer
-            if (_stringIndexer != null && Properties.ContainsKey(propertyName) == false)
-                return new PropertyDescriptor(_stringIndexer.GetMethod.Invoke(_value, new Object[] {propertyName}).ToJsValue(_engine), false, false, false);
+            if (_stringIndexer != null && !Properties.ContainsKey(propertyName))
+                return new PropertyDescriptor(_stringIndexer.GetMethod.Invoke(_value, new Object[] { propertyName }).ToJsValue(_engine), false, false, false);
 
             //  Else try to return a registered property
             return base.GetOwnProperty(propertyName);
@@ -85,9 +85,8 @@ void SetEvents(EventInfo[] eventInfos)
 
                 foreach (var name in names.Select(m => m.OfficialName))
                 {
-                    FastSetProperty(name, new PropertyDescriptor(
-                        new DomFunctionInstance(this, eventInfo.RaiseMethod),
-                        new DomFunctionInstance(this, eventInfo.AddMethod), false, false));
+                    var eventInstance = new DomEventInstance(this, eventInfo);
+                    FastSetProperty(name, new PropertyDescriptor(eventInstance.Getter, eventInstance.Setter, false, false));
                 }
             }
         }
@@ -116,8 +115,8 @@ void SetProperties(IEnumerable<PropertyInfo> properties)
                 foreach (var name in names.Select(m => m.OfficialName))
                 {
                     FastSetProperty(name, new PropertyDescriptor(
-                        new DomFunctionInstance(this, property.GetMethod),
-                        new DomFunctionInstance(this, property.SetMethod), false, false));
+                        new DomFunctionInstance(_engine, property.GetMethod),
+                        new DomFunctionInstance(_engine, property.SetMethod), false, false));
                 }
             }
         }
@@ -136,8 +135,8 @@ void SetMethods(IEnumerable<MethodInfo> methods)
                     // to pick depending on the number (and probably types) of arguments.
                     if (Properties.ContainsKey(name))
                         continue;
-                    
-                    FastAddProperty(name, new DomFunctionInstance(this, method), false, false, false);
+
+                    FastAddProperty(name, new DomFunctionInstance(_engine, method), false, false, false);
                 }
             }
         }