ro-ot/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved to JHtml loading the CSS and JS files found in the media folder of the component.

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2022-05-19 15:34:11 +02:00
parent c99cb17c5b
commit 6e4443b997
Signed by untrusted user: Llewellyn
GPG Key ID: A9201372263741E7
11 changed files with 98 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -143,11 +143,11 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 16th May, 2022 + *Last Build*: 19th May, 2022
+ *Version*: 2.12.17 + *Version*: 2.12.17
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **286766** + *Line count*: **286780**
+ *Field count*: **1581** + *Field count*: **1581**
+ *File count*: **1853** + *File count*: **1853**
+ *Folder count*: **261** + *Folder count*: **261**

4
admin/README.txt
View File

@ -143,11 +143,11 @@ TODO
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder) + *Name*: [Component Builder](https://github.com/vdm-io/Joomla-Component-Builder)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 16th May, 2022 + *Last Build*: 19th May, 2022
+ *Version*: 2.12.17 + *Version*: 2.12.17
+ *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved. + *Copyright*: Copyright (C) 2015 Vast Development Method. All rights reserved.
+ *License*: GNU General Public License version 2 or later; see LICENSE.txt + *License*: GNU General Public License version 2 or later; see LICENSE.txt
+ *Line count*: **286766** + *Line count*: **286780**
+ *Field count*: **1581** + *Field count*: **1581**
+ *File count*: **1853** + *File count*: **1853**
+ *Folder count*: **261** + *Folder count*: **261**

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

@ -8621,11 +8621,11 @@ class Get
*/ */
protected function getPowers($guids) protected function getPowers($guids)
{ {
if (ArrayHelper::check($guids, true)) if (ArrayHelper::check($guids))
{ {
foreach ($guids as $guid) foreach ($guids as $guid => $build)
{ {
$this->getPower($guid); $this->getPower($guid, $build);
} }
} }
} }
@ -8636,9 +8636,9 @@ class Get
* @return mixed * @return mixed
* *
*/ */
public function getPower($guid) public function getPower($guid, $build = 0)
{ {
if ($this->addPower && $this->setPower($guid)) if (($this->addPower || $build == 1) && $this->setPower($guid))
{ {
return $this->powers[$guid]; return $this->powers[$guid];
} }
@ -8805,6 +8805,7 @@ class Get
} }
// load use ids // load use ids
$use = array(); $use = array();
$as = array();
// check if we have use selection // check if we have use selection
$power->use_selection = (isset($power->use_selection) $power->use_selection = (isset($power->use_selection)
&& JsonHelper::check( && JsonHelper::check(
@ -8812,7 +8813,10 @@ class Get
)) ? json_decode($power->use_selection, true) : null; )) ? json_decode($power->use_selection, true) : null;
if ($power->use_selection) if ($power->use_selection)
{ {
$use = array_values(array_map(function ($u) { $use = array_values(array_map(function ($u) use(&$as) {
// track the AS options
$as[$u['use']] = (string) $u['as'];
// return the guid
return $u['use']; return $u['use'];
}, $power->use_selection)); }, $power->use_selection));
} }
@ -8857,7 +8861,7 @@ class Get
if ($this->setPower($implement)) if ($this->setPower($implement))
{ {
// get the name // get the name
$power->implement_names[] = $this->getPower($implement)->class_name; $power->implement_names[] = $this->getPower($implement, 1)->class_name;
// add to use // add to use
$use[] = $implement; $use[] = $implement;
} }
@ -8884,7 +8888,7 @@ class Get
if ($this->setPower($power->extends)) if ($this->setPower($power->extends))
{ {
// get the name // get the name
$power->extends_name = $this->getPower($power->extends)->class_name; $power->extends_name = $this->getPower($power->extends, 1)->class_name;
// add to use // add to use
$use[] = $power->extends; $use[] = $power->extends;
} }
@ -8915,11 +8919,19 @@ class Get
{ {
if ($this->setPower($u)) if ($this->setPower($u))
{ {
$add_use = $this->getPower($u)->namespace; $add_use = $this->getPower($u, 1)->namespace;
// check if it is already added manually, you know how some people are // check if it is already added manually, you know how some people are
if (strpos($power->head, $add_use) === false) if (strpos($power->head, $add_use) === false)
{ {
$power->head .= 'use ' . $add_use . ';' . PHP_EOL; // check if it has an AS option
if (isset($as[$u]) && StringHelper::check($as[$u]) && $as[$u] !== 'default')
{
$power->head .= 'use ' . $add_use . ' as ' . $as[$u] . ';' . PHP_EOL;
}
else
{
$power->head .= 'use ' . $add_use . ';' . PHP_EOL;
}
} }
} }
} }

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

@ -6217,21 +6217,12 @@ class Interpretation extends Fields
$chart[] = $this->_t(2) . "//" . $this->setLine(__LINE__) $chart[] = $this->_t(2) . "//" . $this->setLine(__LINE__)
. " load the google chart js."; . " load the google chart js.";
$chart[] = $this->_t(2) $chart[] = $this->_t(2)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . "/js/google.jsapi.js', (" . $this->componentCodeName . "/js/google.jsapi.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$chart[] = $this->_t(2) $chart[] = $this->_t(2)
. "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', (" . "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/rgbcolor.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$chart[] = $this->_t(2) $chart[] = $this->_t(2)
. "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', (" . "\$this->document->addScript('https://canvg.googlecode.com/svn/trunk/canvg.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
return implode(PHP_EOL, $chart); return implode(PHP_EOL, $chart);
} }
@ -6635,12 +6626,9 @@ class Interpretation extends Fields
. "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
$setter .= PHP_EOL . $tabV . $this->_t(3) $setter .= PHP_EOL . $tabV . $this->_t(3)
. "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/css/uikit'.\$style.\$size.'.css', (" . "/uikit-v2/css/uikit'.\$style.\$size.'.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine( $setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(
__LINE__ __LINE__
@ -6649,12 +6637,9 @@ class Interpretation extends Fields
. "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
$setter .= PHP_EOL . $tabV . $this->_t(3) $setter .= PHP_EOL . $tabV . $this->_t(3)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/js/uikit'.\$size.'.js', (" . "/uikit-v2/js/uikit'.\$size.'.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
} }
// load the components need // load the components need
@ -6748,12 +6733,9 @@ class Interpretation extends Fields
__LINE__ __LINE__
) . " load the css."; ) . " load the css.";
$setter .= PHP_EOL . $tabV . $this->_t(6) $setter .= PHP_EOL . $tabV . $this->_t(6)
. "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine( $setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(
__LINE__ __LINE__
@ -6767,15 +6749,9 @@ class Interpretation extends Fields
__LINE__ __LINE__
) . " load the js."; ) . " load the js.";
$setter .= PHP_EOL . $tabV . $this->_t(6) $setter .= PHP_EOL . $tabV . $this->_t(6)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . "/uikit-v2/js/components/'.\$name.\$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', ("
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true);";
$setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(4) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(4) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(3) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(3) . "}";
@ -6819,12 +6795,9 @@ class Interpretation extends Fields
__LINE__ __LINE__
) . " load the css."; ) . " load the css.";
$setter .= PHP_EOL . $tabV . $this->_t(6) $setter .= PHP_EOL . $tabV . $this->_t(6)
. "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', (" . "/uikit-v2/css/components/'.\$name.\$style.\$size.'.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . $this->_t(5) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(5) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine( $setter .= PHP_EOL . $tabV . $this->_t(5) . "//" . $this->setLine(
__LINE__ __LINE__
@ -6838,7 +6811,7 @@ class Interpretation extends Fields
__LINE__ __LINE__
) . " load the js."; ) . " load the js.";
$setter .= PHP_EOL . $tabV . $this->_t(6) $setter .= PHP_EOL . $tabV . $this->_t(6)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', JURI::root(true) .'/media/com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v2/js/components/'.\$name.\$size.'.js', (" . "/uikit-v2/js/components/'.\$name.\$size.'.js', ("
. $this->fileContentStatic[$this->hhh . 'Component' . $this->fileContentStatic[$this->hhh . 'Component'
@ -6873,12 +6846,9 @@ class Interpretation extends Fields
. "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; . "if ((!\$HeaderCheck->css_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
$setter .= PHP_EOL . $tabV . $this->_t(3) $setter .= PHP_EOL . $tabV . $this->_t(3)
. "\$this->document->addStyleSheet(JURI::root(true) .'/media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v3/css/uikit'.\$size.'.css', (" . "/uikit-v3/css/uikit'.\$size.'.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine( $setter .= PHP_EOL . $tabV . $this->_t(2) . "//" . $this->setLine(
__LINE__ __LINE__
@ -6887,19 +6857,13 @@ class Interpretation extends Fields
. "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)"; . "if ((!\$HeaderCheck->js_loaded('uikit.min') || \$uikit == 1) && \$uikit != 2 && \$uikit != 3)";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "{"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "{";
$setter .= PHP_EOL . $tabV . $this->_t(3) $setter .= PHP_EOL . $tabV . $this->_t(3)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v3/js/uikit'.\$size.'.js', (" . "/uikit-v3/js/uikit'.\$size.'.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$setter .= PHP_EOL . $tabV . $this->_t(3) $setter .= PHP_EOL . $tabV . $this->_t(3)
. "\$this->document->addScript(JURI::root(true) .'/media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/uikit-v3/js/uikit-icons'.\$size.'.js', (" . "/uikit-v3/js/uikit-icons'.\$size.'.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$setter .= PHP_EOL . $tabV . $this->_t(2) . "}"; $setter .= PHP_EOL . $tabV . $this->_t(2) . "}";
if (2 == $this->uikit) if (2 == $this->uikit)
{ {
@ -14146,12 +14110,9 @@ class Interpretation extends Fields
__LINE__ __LINE__
) . " Add the CSS for Footable."; ) . " Add the CSS for Footable.";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addStyleSheet(JURI::root() .'media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/css/footable.core.min.css', (" . "/footable-v2/css/footable.core.min.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine( $foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
__LINE__ __LINE__
) . " Use the Metro Style"; ) . " Use the Metro Style";
@ -14159,12 +14120,9 @@ class Interpretation extends Fields
. "if (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)"; . "if (!isset(\$this->fooTableStyle) || 0 == \$this->fooTableStyle)";
$foo .= PHP_EOL . $this->_t(2) . "{"; $foo .= PHP_EOL . $this->_t(2) . "{";
$foo .= PHP_EOL . $this->_t(3) $foo .= PHP_EOL . $this->_t(3)
. "\$this->document->addStyleSheet(JURI::root() .'media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/css/footable.metro.min.css', (" . "/footable-v2/css/footable.metro.min.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . $this->_t(2) . "}"; $foo .= PHP_EOL . $this->_t(2) . "}";
$foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) $foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
. " Use the Legacy Style."; . " Use the Legacy Style.";
@ -14172,43 +14130,28 @@ class Interpretation extends Fields
. "elseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)"; . "elseif (isset(\$this->fooTableStyle) && 1 == \$this->fooTableStyle)";
$foo .= PHP_EOL . $this->_t(2) . "{"; $foo .= PHP_EOL . $this->_t(2) . "{";
$foo .= PHP_EOL . $this->_t(3) $foo .= PHP_EOL . $this->_t(3)
. "\$this->document->addStyleSheet(JURI::root() .'media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/css/footable.standalone.min.css', (" . "/footable-v2/css/footable.standalone.min.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . $this->_t(2) . "}"; $foo .= PHP_EOL . $this->_t(2) . "}";
$foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine( $foo .= PHP_EOL . PHP_EOL . $this->_t(2) . "//" . $this->setLine(
__LINE__ __LINE__
) . " Add the JavaScript for Footable"; ) . " Add the JavaScript for Footable";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addScript(JURI::root() .'media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . "/footable-v2/js/footable.js', (" . $this->componentCodeName . "/footable-v2/js/footable.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addScript(JURI::root() .'media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/js/footable.sort.js', (" . "/footable-v2/js/footable.sort.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addScript(JURI::root() .'media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/js/footable.filter.js', (" . "/footable-v2/js/footable.filter.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addScript(JURI::root() .'media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v2/js/footable.paginate.js', (" . "/footable-v2/js/footable.paginate.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
if ($init) if ($init)
{ {
$foo .= PHP_EOL . PHP_EOL . $this->_t(2) $foo .= PHP_EOL . PHP_EOL . $this->_t(2)
@ -14232,21 +14175,15 @@ class Interpretation extends Fields
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');"; . "\$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addStyleSheet(JURI::root() .'media/com_" . "JHtml::_('stylesheet', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v3/css/footable.standalone.min.css', (" . "/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');";
$foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__) $foo .= PHP_EOL . $this->_t(2) . "//" . $this->setLine(__LINE__)
. " Add the JavaScript for Footable (adding all funtions)"; . " Add the JavaScript for Footable (adding all functions)";
$foo .= PHP_EOL . $this->_t(2) $foo .= PHP_EOL . $this->_t(2)
. "\$this->document->addScript(JURI::root() .'media/com_" . "JHtml::_('script', 'com_"
. $this->componentCodeName . $this->componentCodeName
. "/footable-v3/js/footable.min.js', (" . "/footable-v3/js/footable.min.js', ['version' => 'auto']);";
. $this->fileContentStatic[$this->hhh . 'Component'
. $this->hhh]
. "Helper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript');";
if ($init) if ($init)
{ {
$foo .= PHP_EOL . PHP_EOL . $this->_t(2) $foo .= PHP_EOL . PHP_EOL . $this->_t(2)

16
admin/models/ajax.php
View File

@ -1398,8 +1398,22 @@ class ComponentbuilderModelAjax extends JModelList
return false; return false;
} }
/**
* The view persistence details
*
* @var array
* @since 3.0.13
*/
protected $viewid = array(); protected $viewid = array();
/**
* Get the view details via the session
*
* @input string $call The persistence key
*
* @return mixed
* @since 3.0.13
*/
protected function getViewID($call = 'table') protected function getViewID($call = 'table')
{ {
if (!isset($this->viewid[$call])) if (!isset($this->viewid[$call]))
@ -1422,7 +1436,7 @@ class ComponentbuilderModelAjax extends JModelList
); );
} }
} }
// set GUID if found (TODO we will later move over to GUID) // set GUID if found
if (($guid = ComponentbuilderHelper::get($vdm . '__guid')) !== false && method_exists('ComponentbuilderHelper', 'validGUID')) if (($guid = ComponentbuilderHelper::get($vdm . '__guid')) !== false && method_exists('ComponentbuilderHelper', 'validGUID'))
{ {
if (ComponentbuilderHelper::validGUID($guid)) if (ComponentbuilderHelper::validGUID($guid))

8
admin/views/compiler/view.html.php
View File

@ -235,12 +235,12 @@ class ComponentbuilderViewCompiler extends JViewLegacy
// The uikit css. // The uikit css.
if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
} }
// The uikit js. // The uikit js.
if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
} }
// Load the script to find all uikit components needed. // Load the script to find all uikit components needed.
@ -280,13 +280,13 @@ class ComponentbuilderViewCompiler extends JViewLegacy
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css')) if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{ {
// load the css. // load the css.
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']);
} }
// check if the JavaScript file exists. // check if the JavaScript file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js')) if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{ {
// load the js. // load the js.
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); JHtml::_('script', 'com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);
} }
} }
} }

6
admin/views/fieldtype/view.html.php
View File

@ -197,9 +197,9 @@ class ComponentbuilderViewFieldtype extends JViewLegacy
// Add the CSS for Footable // Add the CSS for Footable
$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
$this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);
// Add the JavaScript for Footable (adding all funtions) // Add the JavaScript for Footable (adding all functions)
$this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JHtml::_('script', 'com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']);
$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
$this->document->addScriptDeclaration($footable); $this->document->addScriptDeclaration($footable);

8
admin/views/get_snippets/view.html.php
View File

@ -79,12 +79,12 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
// The uikit css. // The uikit css.
if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
} }
// The uikit js. // The uikit js.
if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
} }
// Load the script to find all uikit components needed. // Load the script to find all uikit components needed.
@ -110,13 +110,13 @@ class ComponentbuilderViewGet_snippets extends JViewLegacy
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css')) if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css'))
{ {
// load the css. // load the css.
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/components/'.$name.$style.$size.'.css', ['version' => 'auto']);
} }
// check if the JavaScript file exists. // check if the JavaScript file exists.
if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js')) if (File::exists(JPATH_ROOT.'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js'))
{ {
// load the js. // load the js.
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('type' => 'text/javascript', 'async' => 'async') : true); JHtml::_('script', 'com_componentbuilder/uikit-v2/js/components/'.$name.$size.'.js', ['version' => 'auto'], ['type' => 'text/javascript', 'async' => 'async']);
} }
} }
} }

6
admin/views/server/view.html.php
View File

@ -195,9 +195,9 @@ class ComponentbuilderViewServer extends JViewLegacy
// Add the CSS for Footable // Add the CSS for Footable
$this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css'); $this->document->addStyleSheet('https://maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css');
$this->document->addStyleSheet(JURI::root() .'media/com_componentbuilder/footable-v3/css/footable.standalone.min.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/footable-v3/css/footable.standalone.min.css', ['version' => 'auto']);
// Add the JavaScript for Footable (adding all funtions) // Add the JavaScript for Footable (adding all functions)
$this->document->addScript(JURI::root() .'media/com_componentbuilder/footable-v3/js/footable.min.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JHtml::_('script', 'com_componentbuilder/footable-v3/js/footable.min.js', ['version' => 'auto']);
$footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});"; $footable = "jQuery(document).ready(function() { jQuery(function () { jQuery('.footable').footable();});});";
$this->document->addScriptDeclaration($footable); $this->document->addScriptDeclaration($footable);

2
componentbuilder.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<extension type="component" version="4" method="upgrade"> <extension type="component" version="4" method="upgrade">
<name>COM_COMPONENTBUILDER</name> <name>COM_COMPONENTBUILDER</name>
<creationDate>16th May, 2022</creationDate> <creationDate>19th May, 2022</creationDate>
<author>Llewellyn van der Merwe</author> <author>Llewellyn van der Merwe</author>
<authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail> <authorEmail>llewellyn@joomlacomponentbuilder.com</authorEmail>
<authorUrl>http://www.joomlacomponentbuilder.com</authorUrl> <authorUrl>http://www.joomlacomponentbuilder.com</authorUrl>

4
site/views/api/view.html.php
View File

@ -70,12 +70,12 @@ class ComponentbuilderViewApi extends JViewLegacy
// The uikit css. // The uikit css.
if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->css_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addStyleSheet(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); JHtml::_('stylesheet', 'com_componentbuilder/uikit-v2/css/uikit'.$style.$size.'.css', ['version' => 'auto']);
} }
// The uikit js. // The uikit js.
if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3) if ((!$HeaderCheck->js_loaded('uikit.min') || $uikit == 1) && $uikit != 2 && $uikit != 3)
{ {
$this->document->addScript(JURI::root(true) .'/media/com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/javascript'); JHtml::_('script', 'com_componentbuilder/uikit-v2/js/uikit'.$size.'.js', ['version' => 'auto']);
} }
// add the document default css file // add the document default css file
$this->document->addStyleSheet(JURI::root(true) .'/components/com_componentbuilder/assets/css/api.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css'); $this->document->addStyleSheet(JURI::root(true) .'/components/com_componentbuilder/assets/css/api.css', (ComponentbuilderHelper::jVersion()->isCompatible('3.8.0')) ? array('version' => 'auto') : 'text/css');