Added toastr position class

sinanbozkus · Mar 10, 2020 · 6f1905f · 6f1905f
1 parent e19581d
commit 6f1905f
Show file tree

Hide file tree

Showing 13 changed files with 94 additions and 30 deletions.
diff --git a/dist/formhelper.min.js b/dist/formhelper.min.js
diff --git a/sample/FormHelper.Samples/Startup.cs b/sample/FormHelper.Samples/Startup.cs
@@ -22,15 +22,14 @@ public Startup(IConfiguration configuration)
         public void ConfigureServices(IServiceCollection services)
         {
             // Add FormHelper to the project.
-            services.AddFormHelper(new FormHelperConfiguration
-            {
-                RedirectDelay = 30
-            });
+            services.AddFormHelper();
 
             // Add FormHelper to the project with configurations.
             //services.AddFormHelper(new FormHelperConfiguration
             //{
             //    CheckTheFormFieldsMessage = "Form alanlarını kontrol ediniz."
+            //    RedirectDelay = 30,
+            //    ToastrDefaultPosition = ToastrPosition.BottomFullWidth
             //});
 
             // You can add these validators in a separate class.

diff --git a/sample/FormHelper.Samples/Views/Home/HtmlHelper.cshtml b/sample/FormHelper.Samples/Views/Home/HtmlHelper.cshtml
@@ -12,7 +12,9 @@
         BeforeSubmit = "ProductFormBeforeSubmit", // optional
         Callback = "ProductFormCallback", // optional,
         // EnableButtonAfterSuccess = true, // default => false
+        // ResetFormAfterAuccess = false // default => true
         // DataType = FormDataType.Json // default => FormData
+        // ToastrPosition = ToastrPosition.BottomLeft // default => TopRight
     };
 }
 

diff --git a/sample/FormHelper.Samples/Views/Home/TagHelper.cshtml b/sample/FormHelper.Samples/Views/Home/TagHelper.cshtml
@@ -19,6 +19,7 @@
                           asp-dataType="FormData"
                           asp-callback="ProductFormCallback"
                           asp-beforeSubmit="ProductFormBeforeSubmit"
+                          asp-enableButtonAfterSuccess="true"
                           asp-resetFormAfterSuccess="false"
                           enctype="multipart/form-data">
 

diff --git a/src/FormHelper/Enums/ToastrPosition.cs b/src/FormHelper/Enums/ToastrPosition.cs
@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace FormHelper
+{
+    public enum ToastrPosition
+    {
+        TopRight,
+        BottomRight,
+        BottomLeft,
+        TopLeft,
+        TopFullWidth,
+        BottomFullWidth,
+        TopCenter,
+        BottomCenter
+    }
+}
diff --git a/src/FormHelper/Extensions/FormHelperExtensions.cs b/src/FormHelper/Extensions/FormHelperExtensions.cs
@@ -17,10 +17,10 @@ public static bool IsAjaxRequest(this HttpRequest request)
             return false;
         }
 
-        public static bool IsMobileDevice(this HttpRequest request)
-        {
-            return request.Headers["User-Agent"].ToString().ToLower().Contains("mobi");
-        }
+        //private static bool IsMobileDevice(this HttpRequest request)
+        //{
+        //    return request.Headers["User-Agent"].ToString().ToLower().Contains("mobi");
+        //}
 
         public static string GenerateCoupon(int length)
         {
@@ -33,5 +33,30 @@ public static string GenerateCoupon(int length)
             }
             return result.ToString();
         }
+
+        public static string ToClassName(this ToastrPosition position)
+        {
+            switch (position)
+            {
+                case ToastrPosition.TopRight:
+                    return "toast-top-right";
+                case ToastrPosition.BottomRight:
+                    return "toast-bottom-right";
+                case ToastrPosition.BottomLeft:
+                    return "toast-bottom-left";
+                case ToastrPosition.TopLeft:
+                    return "toast-top-left";
+                case ToastrPosition.TopFullWidth:
+                    return "toast-top-full-width";
+                case ToastrPosition.BottomFullWidth:
+                    return "toast-bottom-full-width";
+                case ToastrPosition.TopCenter:
+                    return "toast-bottom-full-width";
+                case ToastrPosition.BottomCenter:
+                    return "toast-bottom-center";
+                default:
+                    return "toast-top-right";
+            }
+        }
     }
 }
diff --git a/src/FormHelper/FormHelper.csproj b/src/FormHelper/FormHelper.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>FormHelper</PackageId>
-    <Version>3.0.5</Version>
+    <Version>3.1.0</Version>
     <Authors>Sinan BOZKUS</Authors>
     <projectUrl>https://github.com/sinanbozkus/FormHelper</projectUrl>
     <RepositoryUrl>https://github.com/sinanbozkus/FormHelper</RepositoryUrl>

diff --git a/src/FormHelper/Helpers/FormHelperHtmlHelpers.cs b/src/FormHelper/Helpers/FormHelperHtmlHelpers.cs
@@ -23,7 +23,8 @@ public static HtmlString RenderFormScript(this IHtmlHelper html, FormConfig conf
                                         callback: '{config.Callback}',
                                         enableButtonAfterSuccess: {(config.EnableButtonAfterSuccess ? "true" : "false")},
                                         resetFormAfterSuccess: {(config.ResetFormAfterSuccess ? "true" : "false")},
-                                        checkTheFormFieldsMessage: '{configuration.CheckTheFormFieldsMessage}'
+                                        checkTheFormFieldsMessage: '{configuration.CheckTheFormFieldsMessage}',
+                                        toastrPositionClass: '{(config.ToastrPosition == null ? configuration.ToastrDefaultPosition.ToClassName() : config.ToastrPosition.Value.ToClassName())}'
                                     }});
                                 }});
                             </script>

diff --git a/src/FormHelper/Scripts/formhelper.js b/src/FormHelper/Scripts/formhelper.js
@@ -21,16 +21,16 @@
 
         options = $.extend({}, $.formhelper.defaultOptions, options);
 
-        if (window.mobileAndTabletcheck() && toastr) {
-            toastr.options.positionClass = "toast-top-full-width";
-        }
-
         $form.unbind('submit');
 
         $form.on('submit', function (e) {
 
             e.preventDefault();
 
+            var toastrOptions = {
+                positionClass: window.mobileAndTabletcheck() ? "toast-top-full-width" : options.toastrPositionClass
+            };
+
             $form.removeData("validator");
             $form.removeData("unobtrusiveValidation");
             $.validator.unobtrusive.parse($form);
@@ -39,7 +39,7 @@
 
             if (!validationResult) {
                 if (toastr) {
-                    toastr.error(options.checkTheFormFieldsMessage);
+                    toastr.error(options.checkTheFormFieldsMessage, null, toastrOptions);
                 }
                 return false;
             }
@@ -49,6 +49,7 @@
             var headers = {};
             var formData = {};
             var contentType = {};
+
             if (options.dataType === "FormData") {
                 formData = new FormData($form[0]);
                 contentType = false;
@@ -84,13 +85,11 @@
                     }
                 },
                 success: function (result, status) {
-
+                    
                     if (result.isSucceed === false) {
                         $form.find("button[type='submit']").removeAttr('disabled');
                     }
 
-                    var toastrOptions = {};
-
                     if (result.redirectUri) {
                         toastrOptions = {
                             timeOut: 0,
@@ -113,7 +112,7 @@
                             toastr.error(result.message, null, toastrOptions);
                         }
                     } else if (result.isSucceed === false) {
-                        toastr.error(options.checkTheFormFieldsMessage);
+                        toastr.error(options.checkTheFormFieldsMessage, null, toastrOptions);
                     }
 
                     if (result.validationErrors && result.validationErrors.length > 0) {
@@ -140,18 +139,22 @@
                         }, hasMessage ? delay : 1);
                     }
 
-                    if (options.enableButtonAfterSuccess) {
-                        $form.find("button[type='submit']").removeAttr('disabled');
-                    }
+
+
+                    if (result.status === 1) {
 
-                    if (options.resetFormAfterSuccess) {
-
-                        $form[0].reset();
+                        if (options.enableButtonAfterSuccess) {
+                            $form.find("button[type='submit']").removeAttr('disabled');
+                        }
+
+                        if (options.resetFormAfterSuccess) {
+                            $form[0].reset();
+                        }
                     }
                 },
                 error: function (request, status, error) {
                     console.error(request.responseText);
-                    toastr.error(request.responseText);
+                    toastr.error(request.responseText, null, toastrOptions);
                 }
             });
 
@@ -172,7 +175,8 @@
         beforeSubmit: null,
         callback: null,
         enableButtonAfterSuccess: false,
-        resetFormAfterSuccess: false
+        resetFormAfterSuccess: false,
+        toastrPositionClass: null
     };
 
 
@@ -191,7 +195,8 @@
                 beforeSubmit: $(this).attr("beforeSubmit"),
                 callback: $(this).attr("callback"),
                 enableButtonAfterSuccess: $(this).attr("enableButtonAfterSuccess") === "True",
-                resetFormAfterSuccess: $(this).attr("ResetFormAfterSuccess") === "True"
+                resetFormAfterSuccess: $(this).attr("ResetFormAfterSuccess") === "True",
+                toastrPositionClass: $(this).attr("toastrPositionClass")
             };
 
         return new $.formhelper(options, this);