Skip to content

Commit 2c47018

Browse files
committed
Don't overwrite original field classes in frameworks
1 parent d1009b5 commit 2c47018

File tree

5 files changed

+27
-25
lines changed

5 files changed

+27
-25
lines changed

src/Former/Framework/TwitterBootstrap.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,7 @@ public function getFieldClasses(Field $field, $classes)
130130
$classes = $this->filterFieldClasses($classes);
131131
}
132132

133-
// If we found any class, add them
134-
if ($classes) {
135-
$field->class(implode(' ', $classes));
136-
}
137-
138-
return $field;
133+
return $this->addClassesToField($field, $classes);
139134
}
140135

141136
/**

src/Former/Framework/TwitterBootstrap3.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,7 @@ public function getFieldClasses(Field $field, $classes)
202202
$classes[] = 'form-control';
203203
}
204204

205-
// If we found any class, add them
206-
if ($classes) {
207-
$field->class(implode(' ', $classes));
208-
}
209-
210-
return $field;
205+
return $this->addClassesToField($field, $classes);
211206
}
212207

213208
/**

src/Former/Framework/ZurbFoundation.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,7 @@ public function getFieldClasses(Field $field, $classes = array())
108108
{
109109
$classes = $this->filterFieldClasses($classes);
110110

111-
// If we found any class, add them
112-
if ($classes) {
113-
$field->class(implode(' ', $classes));
114-
}
115-
116-
return $field;
111+
return $this->addClassesToField($field, $classes);
117112
}
118113

119114
public function getGroupClasses()

src/Former/Framework/ZurbFoundation4.php

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -110,12 +110,7 @@ public function getFieldClasses(Field $field, $classes = array())
110110
$classes = $this->filterFieldClasses($classes);
111111
}
112112

113-
// If we found any class, add them
114-
if ($classes) {
115-
$field->class(implode(' ', $classes));
116-
}
117-
118-
return $field;
113+
return $this->addClassesToField($field, $classes);
119114
}
120115

121116
public function getGroupClasses()

src/Former/Traits/Framework.php

Lines changed: 23 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,6 +196,22 @@ public function createIcon($iconType, $attributes = array(), $iconSettings = arr
196196
///////////////////////////// HELPERS //////////////////////////////
197197
////////////////////////////////////////////////////////////////////
198198

199+
/**
200+
* Add classes to a field
201+
*
202+
* @param Field $field
203+
* @param array $classes
204+
*/
205+
protected function addClassesToField($field, $classes)
206+
{
207+
// If we found any class, add them
208+
if ($classes) {
209+
$field->addClass(implode(' ', $classes));
210+
}
211+
212+
return $field;
213+
}
214+
199215
/**
200216
* Prepend an array of classes with a string
201217
*
@@ -249,6 +265,13 @@ public function createLabelOf(Field $field, Element $label = null)
249265
return $label;
250266
}
251267

268+
/**
269+
* Get an option for the current framework
270+
*
271+
* @param string $option
272+
*
273+
* @return string
274+
*/
252275
protected function getFrameworkOption($option)
253276
{
254277
return $this->app['config']->get("former::{$this->current()}.$option");
@@ -269,5 +292,4 @@ public function wrapLabel($label)
269292
{
270293
return $label;
271294
}
272-
273295
}

0 commit comments

Comments
 (0)