From d3c3e8f30580d6d6a579486bbdd5707ff1967cb3 Mon Sep 17 00:00:00 2001 From: sinanbozkus Date: Sat, 28 Nov 2020 15:57:50 +0200 Subject: [PATCH] Updated to .NET 5.0 --- .../FormHelper.Samples.csproj | 6 +- .../wwwroot/js/formhelper.js | 202 ------------------ .../wwwroot/js/formhelper.min.js | 1 - src/FormHelper/FormHelper.csproj | 11 +- 4 files changed, 11 insertions(+), 209 deletions(-) delete mode 100644 sample/FormHelper.Samples/wwwroot/js/formhelper.js delete mode 100644 sample/FormHelper.Samples/wwwroot/js/formhelper.min.js diff --git a/sample/FormHelper.Samples/FormHelper.Samples.csproj b/sample/FormHelper.Samples/FormHelper.Samples.csproj index 221e009..506a70c 100755 --- a/sample/FormHelper.Samples/FormHelper.Samples.csproj +++ b/sample/FormHelper.Samples/FormHelper.Samples.csproj @@ -1,17 +1,15 @@  - netcoreapp3.1 + net5.0 - - @@ -20,7 +18,7 @@ - + \ No newline at end of file diff --git a/sample/FormHelper.Samples/wwwroot/js/formhelper.js b/sample/FormHelper.Samples/wwwroot/js/formhelper.js deleted file mode 100644 index f70be43..0000000 --- a/sample/FormHelper.Samples/wwwroot/js/formhelper.js +++ /dev/null @@ -1,202 +0,0 @@ -window.mobileAndTabletcheck = function () { - var check = false; - (function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; })(navigator.userAgent || navigator.vendor || window.opera); - return check; -}; - - -(function ($) { - "use strict"; - - $.formhelper = function (options, el) { - - var self = this; - var $form = $(el); - - if (window.FormData === undefined) { - $form.find("button[type='submit']").attr('disabled', 'disabled'); - alert("Your internet browser is old and not compatible with Form Helper! Update your browser."); - return; - } - - 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(); - - $form.removeData("validator"); - $form.removeData("unobtrusiveValidation"); - $.validator.unobtrusive.parse($form); - - var validationResult = $form.valid(); - - if (!validationResult) { - if (toastr) { - toastr.error(options.checkTheFormFieldsMessage); - } - return false; - } - - $form.find("button[type='submit']").attr('disabled', 'disabled'); - - var headers = {}; - var formData = {}; - var contentType = {}; - if (options.dataType === "FormData") { - formData = new FormData($form[0]); - contentType = false; - } - else { - - var formDataAsJson = new Object(); - - $.each($form.serializeArray(), function (key, item) { - formDataAsJson[item.name] = item.value; - }); - - if (formDataAsJson.__RequestVerificationToken !== undefined) { - headers['RequestVerificationToken'] = formDataAsJson.__RequestVerificationToken; - } - - formData = JSON.stringify(formDataAsJson); - contentType = "application/json; charset=utf-8"; - } - - //send ajax - - $.ajax({ - url: options.url, - type: options.method, - headers: headers, - data: formData, - contentType: contentType, - processData: false, - beforeSend: function (arr) { - if (options.beforeSubmit) { - return window[options.beforeSubmit](arr, $form); - } - }, - success: function (result, status) { - - if (!result.isSucceed) { - $form.find("button[type='submit']").removeAttr('disabled'); - } - - var toastrOptions = {}; - - if (result.redirectUri) { - toastrOptions = { - timeOut: 0, - extendedTimeOut: 0 - }; - } - - var hasMessage = result.message && result.message !== ""; - - - if (hasMessage) { - - if (result.status === 1) { - toastr.success(result.message, null, toastrOptions); - } else if (result.status === 2) { - toastr.info(result.message, null, toastrOptions); - } else if (result.status === 3) { - toastr.warning(result.message, null, toastrOptions); - } else if (result.status === 4) { - toastr.error(result.message, null, toastrOptions); - } - } else { - toastr.error(options.checkTheFormFieldsMessage); - } - - if (result.validationErrors && result.validationErrors.length > 0) { - $form.find("button[type='submit']").removeAttr('disabled'); - var validator = $form.validate(); - for (var i in result.validationErrors) { - var propertyName = result.validationErrors[i].propertyName; - var errorMessage = result.validationErrors[i].message; - var obj = new Object(); - obj[propertyName] = errorMessage; - validator.showErrors(obj); - } - } - - if (options.callback) { - window[options.callback](result); - } - - var delay = result.redirectDelay ? result.redirectDelay : options.redirectDelay; - - if (result.redirectUri) { - setTimeout(function () { - window.location.replace(result.redirectUri); - }, hasMessage ? delay : 1); - } - - if (options.enableButtonAfterSuccess) { - $form.find("button[type='submit']").removeAttr('disabled'); - } - }, - error: function (request, status, error) { - console.error(request.responseText); - toastr.error(request.responseText); - } - }); - - //end ajax request - - - }); - - }; - - - $.formhelper.defaultOptions = { - url: '#', - method: 'POST', - dataType: 'FormData', - checkTheFormFieldsMessage: 'Check the form fields', - redirectDelay: 1500, - beforeSubmit: null, - callback: null, - enableButtonAfterSuccess: false - }; - - - - $.fn.UseFormHelper = function (options) { - - //return this.each(function () { - - if (!options) - options = { - url: $(this).attr("action"), - method: $(this).attr("method"), - dataType: $(this).attr("dataType"), - checkTheFormFieldsMessage: $(this).attr("CheckTheFormFieldsMessage"), - redirectDelay: parseInt($(this).attr("redirectDelay")), - beforeSubmit: $(this).attr("beforeSubmit"), - callback: $(this).attr("callback"), - enableButtonAfterSuccess: $(this).attr("enableButtonAfterSuccess") === "True" - }; - - return new $.formhelper(options, this); - - //}); - - - }; - -})(jQuery); - - -//$(document).ready(function () { -// $('.formhelper').UseFormHelper(); -//}); \ No newline at end of file diff --git a/sample/FormHelper.Samples/wwwroot/js/formhelper.min.js b/sample/FormHelper.Samples/wwwroot/js/formhelper.min.js deleted file mode 100644 index 3fb753b..0000000 --- a/sample/FormHelper.Samples/wwwroot/js/formhelper.min.js +++ /dev/null @@ -1 +0,0 @@ -window.mobileAndTabletcheck=function(){var n=!1;return function(t){(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(t)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(t.substr(0,4)))&&(n=!0)}(navigator.userAgent||navigator.vendor||window.opera),n},function(n){"use strict";n.formhelper=function(t,i){var u=this,r=n(i);if(window.FormData===undefined){r.find("button[type='submit']").attr("disabled","disabled");alert("Your internet browser is old and not compatible with Form Helper! Update your browser.");return}t=n.extend({},n.formhelper.defaultOptions,t);window.mobileAndTabletcheck()&&toastr&&(toastr.options.positionClass="toast-top-full-width");r.unbind("submit");r.on("submit",function(i){var o,u;if(i.preventDefault(),r.removeData("validator"),r.removeData("unobtrusiveValidation"),n.validator.unobtrusive.parse(r),o=r.valid(),!o)return toastr&&toastr.error(t.checkTheFormFieldsMessage),!1;r.find("button[type='submit']").attr("disabled","disabled");var s={},f={},e={};t.dataType==="FormData"?(f=new FormData(r[0]),e=!1):(u={},n.each(r.serializeArray(),function(n,t){u[t.name]=t.value}),u.__RequestVerificationToken!==undefined&&(s.RequestVerificationToken=u.__RequestVerificationToken),f=JSON.stringify(u),e="application/json; charset=utf-8");n.ajax({url:t.url,type:t.method,headers:s,data:f,contentType:e,processData:!1,beforeSend:function(n){if(t.beforeSubmit)return window[t.beforeSubmit](n,r)},success:function(n){var i,u,e,f,s;if(n.isSucceed||r.find("button[type='submit']").removeAttr("disabled"),i={},n.redirectUri&&(i={timeOut:0,extendedTimeOut:0}),u=n.message&&n.message!=="",u?n.status===1?toastr.success(n.message,null,i):n.status===2?toastr.info(n.message,null,i):n.status===3?toastr.warning(n.message,null,i):n.status===4&&toastr.error(n.message,null,i):toastr.error(t.checkTheFormFieldsMessage),n.validationErrors&&n.validationErrors.length>0){r.find("button[type='submit']").removeAttr("disabled");e=r.validate();for(f in n.validationErrors){var h=n.validationErrors[f].propertyName,c=n.validationErrors[f].message,o={};o[h]=c;e.showErrors(o)}}t.callback&&window[t.callback](n);s=n.redirectDelay?n.redirectDelay:t.redirectDelay;n.redirectUri&&setTimeout(function(){window.location.replace(n.redirectUri)},u?s:1);t.enableButtonAfterSuccess&&r.find("button[type='submit']").removeAttr("disabled")},error:function(n){console.error(n.responseText);toastr.error(n.responseText)}})})};n.formhelper.defaultOptions={url:"#",method:"POST",dataType:"FormData",checkTheFormFieldsMessage:"Check the form fields",redirectDelay:1500,beforeSubmit:null,callback:null,enableButtonAfterSuccess:!1};n.fn.UseFormHelper=function(t){return t||(t={url:n(this).attr("action"),method:n(this).attr("method"),dataType:n(this).attr("dataType"),checkTheFormFieldsMessage:n(this).attr("CheckTheFormFieldsMessage"),redirectDelay:parseInt(n(this).attr("redirectDelay")),beforeSubmit:n(this).attr("beforeSubmit"),callback:n(this).attr("callback"),enableButtonAfterSuccess:n(this).attr("enableButtonAfterSuccess")==="True"}),new n.formhelper(t,this)}}(jQuery); \ No newline at end of file diff --git a/src/FormHelper/FormHelper.csproj b/src/FormHelper/FormHelper.csproj index 4fdff9d..a7a8128 100755 --- a/src/FormHelper/FormHelper.csproj +++ b/src/FormHelper/FormHelper.csproj @@ -2,7 +2,7 @@ FormHelper - 3.2.3 + 3.3.0 Sinan BOZKUS https://github.com/sinanbozkus/FormHelper https://github.com/sinanbozkus/FormHelper @@ -15,7 +15,7 @@ - netcoreapp30;netcoreapp31 + net50;netcoreapp30;netcoreapp31 @@ -58,4 +58,11 @@ + + + + + + + \ No newline at end of file