From 63cd61ffd291d97d189a7958c6547aa7e3545df5 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Thu, 20 Oct 2022 16:54:06 +0200 Subject: [PATCH] MVC - Bootgrid / form control minor additions. minor fix for 528474372b373c720962e5efaad3c7cf6773917a moving formatters out of section so types like checkboxes may also be converted if needed --- src/opnsense/www/js/opnsense.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/opnsense/www/js/opnsense.js b/src/opnsense/www/js/opnsense.js index 842e1e1f3..6fb5bd59d 100644 --- a/src/opnsense/www/js/opnsense.js +++ b/src/opnsense/www/js/opnsense.js @@ -96,14 +96,14 @@ function getFormData(parent) { // deserialize the field content - used for JS maintained fields node[keypart] = sourceNode.data('data'); } else { - // regular input type, might need a parser to convert to the correct format - // (attribute type_formatter as function name) - if (sourceNode.attr('type_formatter') !== undefined && window[sourceNode.attr('type_formatter')] !== undefined) { - node[keypart] = window[sourceNode.attr('type_formatter')](sourceNode.val()); - } else { - node[keypart] = sourceNode.val(); - } + node[keypart] = sourceNode.val(); } + // Might need a parser to convert to the correct format + // (attribute type_formatter as function name) + if (sourceNode.attr('type_formatter') !== undefined && window[sourceNode.attr('type_formatter')] !== undefined) { + node[keypart] = window[sourceNode.attr('type_formatter')](node[keypart]); + } + } }); });