joomla/Component-Builder
39
25
Fork 11
Code Issues 75 Pull Requests Projects 4 Wiki Activity

Added Uikit3 to JCB in response gh-92

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-11-11 06:33:51 +02:00
parent 48d821628d
commit efde286a1b
19 changed files with 35688 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin/helpers/compiler/c_Fields.php
View File

@ -1253,7 +1253,7 @@ class Fields extends Structure
* @return void
*
*/
public function buildSiteFieldData($view,$field,$set,$type)
public function buildSiteFieldData($view, $field, $set, $type)
{
$decode = array('json','base64','basic_encryption','advance_encryption');
$uikit = array('textarea','editor');
@ -1267,7 +1267,7 @@ class Fields extends Structure
$this->siteFieldData['decode'][$array['site']][$code][$array['as']][$array['key']] = array('decode' => $set, 'type' => $type);
}
// set the uikit checker
if ($this->uikit && in_array($type,$uikit))
if ((2 == $this->uikit || 1 == $this->uikit) && in_array($type, $uikit))
{
$this->siteFieldData['uikit'][$array['site']][$code][$array['as']][$array['key']] = $array;
}
@ -2027,9 +2027,8 @@ class Fields extends Structure
{
$this->getItemsMethodEximportStringFixBuilder[$viewName][] = array('name' => $name, 'type' => $typeName, 'translation' => false, 'custom' => $custom, 'method' => $field['settings']->store);
}
// check if field should be added to uikit
$this->buildSiteFieldData($viewName, $name, 'uikit', $typeName);
$this->buildSiteFieldData($viewName, $name, 'uikit', $typeName);
// load the selection translation fix
if (ComponentbuilderHelper::checkArray($options) && (isset($field['list']) && $field['list'] == 1) && $typeName != 'repeatable' && $typeName != 'subform')
{