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

31
admin/helpers/compiler/a_Get.php
View File

@ -258,7 +258,7 @@ class Get
*
* @var boolean
*/
public $uikit = false;
public $uikit = 0;
/**
* The UIKIT component checker
@ -721,10 +721,8 @@ class Get
unset($component->addfiles);
// set the uikit switch
if ($component->adduikit)
{
$this->uikit = true;
}
$this->uikit = $component->adduikit;
// set the footable switch
if ($component->addfootable)
{
@ -1616,11 +1614,14 @@ class Get
$view->Code = ComponentbuilderHelper::safeString($view->code, 'F');
$view->CODE = ComponentbuilderHelper::safeString($view->code, 'U');
// insure the uikit components are loaded
if (!isset($this->uikitComp[$view->code]))
if (2 == $this->uikit || 1 == $this->uikit)
{
$this->uikitComp[$view->code] = array();
if (!isset($this->uikitComp[$view->code]))
{
$this->uikitComp[$view->code] = array();
}
$this->uikitComp[$view->code] = ComponentbuilderHelper::getUikitComp($view->default,$this->uikitComp[$view->code]);
}
$this->uikitComp[$view->code] = ComponentbuilderHelper::getUikitComp($view->default,$this->uikitComp[$view->code]);
// check for footable
if (!isset($this->footableScripts[$this->target][$view->code]) || !$this->footableScripts[$this->target][$view->code])
{
@ -1659,8 +1660,11 @@ class Get
if (isset($view->{'add_'.$scripter}) && $view->{'add_'.$scripter} == 1 && ComponentbuilderHelper::checkString($view->$scripter))
{
$view->$scripter = $this->setDynamicValues(base64_decode($view->$scripter));
// set uikit to views
$this->uikitComp[$view->code] = ComponentbuilderHelper::getUikitComp($view->$scripter,$this->uikitComp[$view->code]);
if (2 == $this->uikit || 1 == $this->uikit)
{
// set uikit to views
$this->uikitComp[$view->code] = ComponentbuilderHelper::getUikitComp($view->$scripter,$this->uikitComp[$view->code]);
}
$this->setTemplateAndLayoutData($view->$scripter,$view->code);
@ -2743,8 +2747,11 @@ class Get
$php_view = $this->setDynamicValues(base64_decode($row->php_view));
}
$contnent = $this->setDynamicValues(base64_decode($row->{$table}));
// set uikit to views
$this->uikitComp[$view] = ComponentbuilderHelper::getUikitComp($contnent,$this->uikitComp[$view]);
if (2 == $this->uikit || 1 == $this->uikit)
{
// set uikit to views
$this->uikitComp[$view] = ComponentbuilderHelper::getUikitComp($contnent,$this->uikitComp[$view]);
}
// set footable to views and turn it on
if (!isset($this->footableScripts[$this->target][$view]) || !$this->footableScripts[$this->target][$view])
{