diff --git a/src/resources/views/input-array.blade.php b/src/resources/views/input-array.blade.php index 3bb2ca9..154bff5 100755 --- a/src/resources/views/input-array.blade.php +++ b/src/resources/views/input-array.blade.php @@ -8,7 +8,7 @@ --}}
-
+
{{-- .json-input-element #json-$name use handlebars or other script to display content here --}}
\ No newline at end of file diff --git a/src/resources/views/input-attr.blade.php b/src/resources/views/input-attr.blade.php index b8d4de9..37e5260 100755 --- a/src/resources/views/input-attr.blade.php +++ b/src/resources/views/input-attr.blade.php @@ -1,6 +1,6 @@ @if ((isset($loop) && $loop->first) || (!isset($loop))) - @if ($attributes->has('required')) required @endif - aria-required="{{ $attributes->has('required') ? 'true' : 'false' }}" + @if ($attributes->get('required')) required @endif + aria-required="{{ $attributes->get('required') ? 'true' : 'false' }}" aria-invalid="{{ $error ? 'true' : 'false' }}" @endif @@ -18,4 +18,14 @@ @if(!$hide)value="{{ $value }}"@endif @if(($aria_describedby ?? null) !== false)aria-describedby="{{ ($aria_describedby ?? null) ? $aria_describedby : $attributes->get('id', $id_fallback) }}-help"@endif -{{ $attributes->class(['input-' . $basename, 'required' => $attributes->has('required'), $class ?? '' => isset($class)])->merge(['id' => 'input-' . $id_fallback]) }} \ No newline at end of file +@php + // $attributes class function not in older versions + if ($attributes->get('required') == true){ + $attributes = $attributes->merge(['class' => 'required']); + } + if (isset($class)){ + $attributes = $attributes->merge(['class' => $class]); + } + $attributes = $attributes->merge(['class' => 'input-' . $basename, 'id' => 'input-' . $id_fallback]); +@endphp +{{ $attributes }} \ No newline at end of file diff --git a/src/resources/views/label-postfix.blade.php b/src/resources/views/label-postfix.blade.php index c28a1aa..fa3e5e9 100755 --- a/src/resources/views/label-postfix.blade.php +++ b/src/resources/views/label-postfix.blade.php @@ -1 +1 @@ -@if ($attributes->has('required')) *@endif \ No newline at end of file +@if ($attributes->get('required')) *@endif \ No newline at end of file