Merge pull request #21 from Blazored/KellsoHP-main

PR #16 from @KellsoHP rebased onto main

.editorconfig

@@ -0,0 +1,9 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+############################### 
+# Core EditorConfig Options   # 
+############################### 
+root = true
+
+# Code files 
+[*.{cs,csx,vb,vbx}] 
+indent_style = tab

src/Blazored.Video/Support/MediaErrorState.cs

@@ -0,0 +1,17 @@
+namespace Blazored.Video.Support
+{
+	/// <summary>
+	/// Presents media error object.
+	/// </summary>
+	public class MediaErrorState
+	{
+		public MediaErrorType Code { get; set; }
+
+		public string Message { get; set; }
+
+		public override string ToString()
+		{
+			return this.Code.ToString();
+		}
+	}
+}

src/Blazored.Video/Support/MediaError.cs → src/Blazored.Video/Support/MediaErrorType.cs

@@ -1,10 +1,10 @@
 namespace Blazored.Video.Support
 {
-	public enum MediaError
+	public enum MediaErrorType
 	{
 		MEDIA_ERR_ABORTED = 1, // fetching process aborted by user
 		MEDIA_ERR_NETWORK = 2, // error occurred when downloading
 		MEDIA_ERR_DECODE = 3, // error occurred when decoding
 		MEDIA_ERR_SRC_NOT_SUPPORTED = 4, // audio/video not supported
 	}
-}
+}

src/Blazored.Video/Support/VideoState.cs

@@ -12,7 +12,7 @@ public class VideoState
 		/// <summary>
 		/// Returns a List&lt;<see cref="AudioTrack"/>&gt; object representing available audio tracks
 		/// </summary>
-		[Obsolete("This is not exactly obsolete, but not yet implemented, sorry",false)]
+		[Obsolete("This is not exactly obsolete, but not yet implemented, sorry", false)]
 		public List<AudioTrack> AudioTracks { get; set; }
 		/// <summary>
 		/// Returns whether the audio/video should start playing as soon as it is loaded
@@ -56,9 +56,9 @@ public class VideoState
 		/// </summary>
 		public bool Ended { get; set; }
 		/// <summary>
-		/// Returns a <see cref="MediaError"/> object representing the error state of the audio/video
+		/// Returns a <see cref="MediaErrorState"/> object representing the error state of the audio/video
 		/// </summary>
-		public MediaError Error { get; set; }
+		public MediaErrorState Error { get; set; }
 		/// <summary>
 		/// Returns whether the audio/video should start over again when finished
 		/// </summary>
@@ -134,4 +134,4 @@ public class VideoState
 		/// </summary>
 		public BlazoredVideo Video { get; set; }
 	}
-}
+}

src/Blazored.Video/wwwroot/blazoredVideo.js

@@ -85,22 +85,35 @@ export function registerCustomEventHandler(el, eventName, payload) {
 
 	// Craft a bespoke json string to serve as a payload for the event
 	function getJSON(el, eventName, payload) {
-		let data = { id: el.id };
 		if (payload && payload.length > 0) {
 			// this syntax copies just the properties we request from the source element
 			// IE 11 compatible
+			let data = {};
 			for (var obj in payload) {
 				var item = payload[obj];
-				if (el[item]) {
-					data[item] = el[item];
+				var itemValue = el[item];
+				if (itemValue) {
+					if (typeof itemValue === 'object') {
+						data[item] = {}
+						for (var inhProp in itemValue) {
+							data[item][inhProp] = itemValue[inhProp]
+						}
+					}
+					else {
+						data[item] = itemValue
+					}
 				}
 			}
-		}
 
-		// this stringify overload eliminates undefined/null/empty values
-		return JSON.stringify(
-			{ id: el.id, name: eventName, state: data },
-			function (k, v) { return (v === undefined || v == null || v.length === 0) ? undefined : v }
-		);
+			// this stringify overload eliminates undefined/null/empty values
+			return JSON.stringify(
+				{ name: eventName, state: data }
+				, function (k, v) { return (v === undefined || v == null || v.length === 0) ? undefined : v }
+			)
+		} else {
+			return JSON.stringify(
+				{ name: eventName }
+			)
+		}
 	}
 }

tests/Blazored.Video.Tests/VideoDataInflateDeflateTests.cs

@@ -33,7 +33,7 @@ public void CanBeInflatedFromEmptyData()
 		public void CanBeInflatedFromAllData()
 		{
 
-			var data = @"{""id"":""video1"",""name"":""Pause"",""state"":{""id"":""video1"",""Autoplay"":false,""Controls"":true,
+			var data = @"{""id"":""video1"",""name"":""Pause"",""state"":{""id"":""video1"",""Autoplay"":false,""Controls"":true,""error"":{""code"":2,""message"":""some message""},
 				""CurrentSrc"":""https://res.cloudinary.com/blazoredgitter/video/upload/v1557015491/samples/elephants.mp4"",
 				""CurrentTime"":5.25375,""DefaultMuted"":false,""DefaultPlaybackRate"":1,""Duration"":48.516,""Ended"":false,
 				""Loop"":false,""Muted"":false,""NetworkState"":1,""Paused"":true,""PlaybackRate"":1,
@@ -64,7 +64,9 @@ public void CanBeInflatedFromAllData()
 			Assert.Null(result.State.Seekable);
 			Assert.False(result.State.Seeking);
 			Assert.Equal(1, result.State.Volume);
-
+			Assert.NotNull(result.State.Error);
+			Assert.Equal(MediaErrorType.MEDIA_ERR_NETWORK, result.State.Error.Code);
+			Assert.Equal("some message", result.State.Error.Message);
 		}
 
 	}