|
@@ -365,7 +365,7 @@ discard block |
|
|
block discarded – undo |
|
365
|
365
|
|
|
366
|
366
|
// In Bootsrap 3 or 4, don't append the the checkable type (radio/checkbox) as a class if |
|
367
|
367
|
// rendering inline. |
|
368
|
|
- $class = ($this->app['former']->framework() == 'TwitterBootstrap3' || |
|
|
368
|
+ $class = ($this->app['former']->framework() == 'TwitterBootstrap3' || |
|
369
|
369
|
$this->app['former']->framework() == 'TwitterBootstrap4') ? trim($isInline) : $this->checkable.$isInline; |
|
370
|
370
|
|
|
371
|
371
|
// Merge custom attributes with global attributes |
|
@@ -397,7 +397,7 @@ discard block |
|
|
block discarded – undo |
|
397
|
397
|
} elseif ($this->app['former']->framework() == 'TwitterBootstrap4') { |
|
398
|
398
|
// Revised for Bootstrap 4, move the 'input' outside of the 'label' |
|
399
|
399
|
$labelClass = 'form-check-label'; |
|
400
|
|
- $element = $field . Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render(); |
|
|
400
|
+ $element = $field.Element::create('label', $label)->for($attributes['id'])->class($labelClass)->render(); |
|
401
|
401
|
|
|
402
|
402
|
$wrapper_class = $this->inline ? 'form-check form-check-inline' : 'form-check'; |
|
403
|
403
|
|
|
@@ -436,7 +436,7 @@ discard block |
|
|
block discarded – undo |
|
436
|
436
|
$this->app['former']->labels[] = $name; |
|
437
|
437
|
|
|
438
|
438
|
// Count number of fields with the same ID |
|
439
|
|
- $where = array_filter($this->app['former']->labels, function ($label) use ($name) { |
|
|
439
|
+ $where = array_filter($this->app['former']->labels, function($label) use ($name) { |
|
440
|
440
|
return $label == $name; |
|
441
|
441
|
}); |
|
442
|
442
|
$unique = sizeof($where); |
Please login to merge, or discard this patch.