From add348e8abe66b170e22bde6cae29c2ea43a87c0 Mon Sep 17 00:00:00 2001
From: Dan Nilsson <mail@dannilsson.se>
Date: Mon, 11 May 2020 07:43:11 +0200
Subject: [PATCH] Fix/remove trim inside empty (#13)

* add min max for time input field

* fix condition check

* remove trim inside empty

* Reset conf file

Co-authored-by: Sebastian Thulin <sebastian.thulin@helsingborg.se>
---
 acf-fields/json/form.json                     |  2 +-
 acf-fields/php/form.php                       | 19 +++++++++++--------
 .../views/fields-editable/input.blade.php     |  6 +++---
 .../php/Module/views/fields/input.blade.php   |  6 +++---
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/acf-fields/json/form.json b/acf-fields/json/form.json
index 586ef6da..7aa928da 100644
--- a/acf-fields/json/form.json
+++ b/acf-fields/json/form.json
@@ -2597,7 +2597,7 @@
     "label_placement": "top",
     "instruction_placement": "label",
     "hide_on_screen": "",
-    "active": 1,
+    "active": true,
     "description": ""
 }]
 
\ No newline at end of file
diff --git a/acf-fields/php/form.php b/acf-fields/php/form.php
index 039be24a..1cc6b905 100644
--- a/acf-fields/php/form.php
+++ b/acf-fields/php/form.php
@@ -1,7 +1,9 @@
 <?php 
-
-
if (function_exists('acf_add_local_field_group')) {
-
    acf_add_local_field_group(array(
+
+
+if (function_exists('acf_add_local_field_group')) {
+
+    acf_add_local_field_group(array(
     'key' => 'group_58eb301ecb36a',
     'title' => 'Form',
     'fields' => array(
@@ -1944,10 +1946,10 @@
                         'class' => '',
                         'id' => '',
                     ),
-                    'message' => __('<div style="margin: 5px 0 15px;
-                                                                background: #f1f1f157;
-                                                                border-left: 4px solid #b2b500;
-                                                                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
+                    'message' => __('<div style="margin: 5px 0 15px;
+                                                                background: #f1f1f157;
+                                                                border-left: 4px solid #b2b500;
+                                                                box-shadow: 0 1px 1px 0 rgba(0,0,0,.1);
                                                                 padding: 10px;">Conditional fields must be a multi-choise field that is required to fill in and lacks conditional arguments. Note that you may not get email notfications if the requirements aren\'t fulfilled.</div>', 'modularity-form-builder'),
                     'new_lines' => '',
                     'esc_html' => 0,
@@ -2630,4 +2632,5 @@
     'active' => 1,
     'description' => '',
 ));
-
}
\ No newline at end of file
+
+}
\ No newline at end of file
diff --git a/source/php/Module/views/fields-editable/input.blade.php b/source/php/Module/views/fields-editable/input.blade.php
index 890c861c..e0e2e048 100644
--- a/source/php/Module/views/fields-editable/input.blade.php
+++ b/source/php/Module/views/fields-editable/input.blade.php
@@ -32,9 +32,9 @@ class="large-text"
             @if (!empty($field['min_time_value'])) min="{{ trim($field['min_time_value']) }}" @endif
             @if (!empty($field['max_time_value'])) max="{{ trim($field['max_time_value']) }}" @endif
         @elseif (in_array($field['value_type'], array('number', 'range')))
-            min="{{ trim($field['min_value']) }}"
-            max="{{ trim($field['max_value']) }}"
-            step="{{ trim($field['step']) }}"
+            @if (!empty($field['min_value'])) min="{{ trim($field['min_value']) }}" @endif
+            @if (!empty($field['max_value'])) max="{{ trim($field['max_value']) }}" @endif
+            @if (!empty($field['step'])) step="{{ trim($field['step']) }}" @endif
         @endif
     >
 </div>
diff --git a/source/php/Module/views/fields/input.blade.php b/source/php/Module/views/fields/input.blade.php
index 31200654..bd84b706 100644
--- a/source/php/Module/views/fields/input.blade.php
+++ b/source/php/Module/views/fields/input.blade.php
@@ -35,9 +35,9 @@
                     @if (!empty($field['min_time_value'])) min="{{ trim($field['min_time_value']) }}" @endif
                     @if (!empty($field['max_time_value'])) max="{{ trim($field['max_time_value']) }}" @endif
                 @elseif (in_array($field['value_type'], array('number', 'range')))
-                    @if (!empty(trim($field['min_value']))) min="{{ trim($field['min_value']) }}" @endif
-                    @if (!empty(trim($field['max_value']))) max="{{ trim($field['max_value']) }}" @endif
-                    @if (!empty(trim($field['step']))) step="{{ trim($field['step']) }}" @endif
+                    @if (!empty($field['min_value'])) min="{{ trim($field['min_value']) }}" @endif
+                    @if (!empty($field['max_value'])) max="{{ trim($field['max_value']) }}" @endif
+                    @if (!empty($field['step'])) step="{{ trim($field['step']) }}" @endif
                 @endif
             >