joomla/Component-Builder
39
25
Fork 11
Code Issues 76 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

12
admin/helpers/compiler/b_Structure.php
View File

@ -923,11 +923,17 @@ class Structure extends Get
$PHPExcel = array( 'folder' => 'PHPExcel', 'path' => 'admin/helpers', 'rename' => 0);
$this->componentData->folders[] = $PHPExcel;
}
if ($this->uikit)
if (2 == $this->uikit || 1 == $this->uikit)
{
// move the UIKIT Folder into place
$uikit = array( 'folder' => 'uikit', 'path' => 'media', 'rename' => 0);
$this->componentData->folders[] = $uikit;
}
if (2 == $this->uikit || 3 == $this->uikit)
{
// move the UIKIT-3 Folder into place
$uikit = array( 'folder' => 'uikit-3', 'path' => 'media', 'rename' => 0);
$this->componentData->folders[] = $uikit;
}
if ($this->footable && (!isset($this->footableVersion) || 2 == $this->footableVersion))
{
@ -954,7 +960,7 @@ class Structure extends Get
$firstFolder = array_values($pathArray)[0];
$lastFolder = end($pathArray);
// only rename folder if last has folder name
if ($custom['rename'] == 1)
if (isset($custom['rename']) && $custom['rename'] == 1)
{
$custom['path'] = str_replace('/'.$lastFolder,'',$custom['path']);
$rename = 'new';
@ -1062,7 +1068,7 @@ class Structure extends Get
$name = $custom['file'];
}
// check if file should be updated
if (isset($custom['notnew']) && $custom['notnew'] == 0)
if (!isset($custom['notnew']) || $custom['notnew'] == 0 || $custom['notnew'] != 1)
{
$this->notNew[] = $key_pointer;
}