New Joomla plugin builder, GUI placeholders, and many bug fixes #457

Merged
Llewellyn merged 13 commits from staging into master 2019-08-14 11:59:31 +00:00
Showing only changes of commit eae07504fa - Show all commits

View File

@ -1089,16 +1089,6 @@ class Fields extends Structure
$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple, false, $optionArray); $this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple, false, $optionArray);
} }
} }
elseif (ComponentbuilderHelper::fieldCheck($typeName, 'plain'))
{
if ($build)
{
// set builders
$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple);
}
// now add to the field set
$dynamicField = $this->setField('plain', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray);
}
elseif (ComponentbuilderHelper::fieldCheck($typeName, 'spacer')) elseif (ComponentbuilderHelper::fieldCheck($typeName, 'spacer'))
{ {
if ($build) if ($build)
@ -1150,6 +1140,16 @@ class Fields extends Structure
// now add to the field set // now add to the field set
$dynamicField = $this->setField('custom', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray, $custom); $dynamicField = $this->setField('custom', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray, $custom);
} }
else
{
if ($build)
{
// set builders
$this->setBuilders($langLabel, $langView, $view_name_single, $view_name_list, $name, $view, $field, $typeName, $multiple);
}
// now add to the field set
$dynamicField = $this->setField('plain', $fieldAttributes, $name, $typeName, $langView, $view_name_single, $view_name_list, $placeholders, $optionArray);
}
} }
} }
return $dynamicField; return $dynamicField;