Merge pull request #39 from mattosaurus/development

Fix animation easing type
mattosaurus · Jul 26, 2019 · 2c398c9 · 2c398c9
2 parents 3ded7a5 + 43558db
commit 2c398c9
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 6 deletions.
diff --git a/src/ChartJSCore/ChartJSCore.csproj b/src/ChartJSCore/ChartJSCore.csproj
@@ -11,16 +11,15 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <Version>1.5.1</Version>
+    <Version>1.5.2</Version>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <RepositoryUrl>https://github.com/mattosaurus/ChartJSCore</RepositoryUrl>
     <PackageTags>Chart.js chart graph chartjs</PackageTags>
     <PackageProjectUrl>https://github.com/mattosaurus/ChartJSCore</PackageProjectUrl>
     <Platforms>AnyCPU;x64</Platforms>
-    <AssemblyVersion>1.5.1.0</AssemblyVersion>
-    <FileVersion>1.5.1.0</FileVersion>
-    <PackageReleaseNotes>Version 1.5.1 - Fixed color culture issue
-Version 1.5.0 - BREAKING CHANGE: Update to add color object by Davee02</PackageReleaseNotes>
+    <AssemblyVersion>1.5.2.0</AssemblyVersion>
+    <FileVersion>1.5.2.0</FileVersion>
+    <PackageReleaseNotes>Version 1.5.2 - Fixed animation type bug</PackageReleaseNotes>
     <Authors>mattosaurus</Authors>
     <PackOnBuild>true</PackOnBuild>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/src/ChartJSCore/Models/Enums.cs b/src/ChartJSCore/Models/Enums.cs
@@ -14,5 +14,40 @@ public enum ChartType : byte
             HorizontalBar = 7,
             Scatter = 8
         }
+
+        public enum Easing
+        {
+            Linear,
+            EaseInQuad,
+            EaseOutQuad,
+            EaseInOutQuad,
+            EaseInCubic,
+            EaseOutCubic,
+            EaseInOutCubic,
+            EaseInQuart,
+            EaseOutQuart,
+            EaseInOutQuart,
+            EaseInQuint,
+            EaseOutQuint,
+            EaseInOutQuint,
+            EaseInSine,
+            EaseOutSine,
+            EaseInOutSine,
+            EaseInExpo,
+            EaseOutExpo,
+            EaseInOutExpo,
+            EaseInCirc,
+            EaseOutCirc,
+            EaseInOutCirc,
+            EaseInElastic,
+            EaseOutElastic,
+            EaseInOutElastic,
+            EaseInBack,
+            EaseOutBack,
+            EaseInOutBack,
+            EaseInBounce,
+            EaseOutBounce,
+            EaseInOutBounce
+        }
     }
 }
diff --git a/src/ChartJSCore/Models/Options/Animation/Animation.cs b/src/ChartJSCore/Models/Options/Animation/Animation.cs
@@ -1,5 +1,6 @@
 using ChartJSCore.Helpers;
 using Newtonsoft.Json;
+using static ChartJSCore.Models.Enums;
 
 namespace ChartJSCore.Models
 {
@@ -13,7 +14,7 @@ public class Animation : Base
         /// <summary>
         /// Easing function to use. Available options are: 'linear', 'easeInQuad', 'easeOutQuad', 'easeInOutQuad', 'easeInCubic', 'easeOutCubic', 'easeInOutCubic', 'easeInQuart', 'easeOutQuart', 'easeInOutQuart', 'easeInQuint', 'easeOutQuint', 'easeInOutQuint', 'easeInSine', 'easeOutSine', 'easeInOutSine', 'easeInExpo', 'easeOutExpo', 'easeInOutExpo', 'easeInCirc', 'easeOutCirc', 'easeInOutCirc', 'easeInElastic', 'easeOutElastic', 'easeInOutElastic', 'easeInBack', 'easeOutBack', 'easeInOutBack', 'easeInBounce', 'easeOutBounce', 'easeInOutBounce'.
         /// </summary>
-        public int? Easing { get; set; }
+        public Easing? Easing { get; set; }
 
         /// <summary>
         /// Callback called on each step of an animation. Passed a single argument, an object, containing the chart instance and an object with details of the animation.