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

Updated some compiler methods, added footable3, fixed some known issus.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2016-04-22 13:03:43 +01:00
parent 3bc71a935c
commit 6871bfd9a2
438 changed files with 9212 additions and 1221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,6 +102,13 @@ class Get
*/
public $footable = false;
/**
* The FOOTABLE Version
*
* @var int
*/
public $footableVersion;
/**
* The Google Chart Switch per view
*
@ -393,6 +400,8 @@ class Get
if ($component->addfootable)
{
$this->footable = true;
// add the version
$this->footableVersion = (1 == $component->addfootable || 2 == $component->addfootable) ? 2 : $component->addfootable;
}
// ser the addcustommenu data

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

@ -609,12 +609,17 @@ class Structure extends Get
$uikit = array( 'folder' => 'uikit', 'path' => 'media', 'rename' => 0);
$this->componentData->folders[] = $uikit;
}
if ($this->footable)
if ($this->footable && (!isset($this->footableVersion) || 2 == $this->footableVersion))
{
// move the footable folder into place
$footable = array( 'folder' => 'footable', 'path' => 'media', 'rename' => 0);
$footable = array( 'folder' => 'footable2', 'path' => 'media/footable', 'rename' => 1);
$this->componentData->folders[] = $footable;
}
elseif ($this->footable && 3 == $this->footableVersion)
{
// move the footable folder into place
$footable = array( 'folder' => 'footable3', 'path' => 'media/footable', 'rename' => 1);
$this->componentData->folders[] = $footable;
}
// pointer tracker

1211
admin/helpers/compiler/e_Interpretation.php
View File

File diff suppressed because it is too large Load Diff

11
admin/helpers/compiler/f_Infusion.php
View File

@ -68,7 +68,7 @@ class Infusion extends Interpretation
$this->fileContentStatic['###component###'] = ComponentbuilderHelper::safeString($this->componentData->name_code);
// ###COMPANYNAME###
$this->fileContentStatic['###COMPANYNAME###'] = trim($this->componentData->companyname);
$this->fileContentStatic['###COMPANYNAME###'] = trim(JFilterOutput::cleanText($this->componentData->companyname));
// ###CREATIONDATE###
$this->fileContentStatic['###CREATIONDATE###'] = JFactory::getDate($this->componentData->created)->format('jS F, Y');
@ -77,7 +77,7 @@ class Infusion extends Interpretation
$this->fileContentStatic['###BUILDDATE###'] = JFactory::getDate()->format('jS F, Y');
// ###AUTHOR###
$this->fileContentStatic['###AUTHOR###'] = trim($this->componentData->author);
$this->fileContentStatic['###AUTHOR###'] = trim(JFilterOutput::cleanText($this->componentData->author));
// ###AUTHOREMAIL###
$this->fileContentStatic['###AUTHOREMAIL###'] = trim($this->componentData->email);
@ -95,10 +95,10 @@ class Infusion extends Interpretation
$this->fileContentStatic['###VERSION###'] = trim($this->componentData->component_version);
// ###Component_name###
$this->fileContentStatic['###Component_name###'] = ComponentbuilderHelper::safeString($this->componentData->name,'W');
$this->fileContentStatic['###Component_name###'] = JFilterOutput::cleanText($this->componentData->name);;
// ###SHORT_DISCRIPTION###
$this->fileContentStatic['###SHORT_DESCRIPTION###'] = trim($this->componentData->short_description);
$this->fileContentStatic['###SHORT_DESCRIPTION###'] = trim(JFilterOutput::cleanText($this->componentData->short_description));
// ###DESCRIPTION###
$this->fileContentStatic['###DESCRIPTION###'] = trim($this->componentData->description);
@ -169,6 +169,9 @@ class Infusion extends Interpretation
$this->fileContentStatic['###ROUTER_PARSE_SWITCH###'] = '';
// build route views
$this->fileContentStatic['###ROUTER_BUILD_VIEWS###'] = '';
// add the helper emailer if set
$this->fileContentStatic['###HELPER_EMAIL###'] = $this->addEmailHelper();
// setup back-views and all needed stuff for the admin
if (isset($this->componentData->admin_views) && ComponentbuilderHelper::checkArray($this->componentData->admin_views))