Martin/Component-Builder
1
0
Fork 0
forked from joomla/Component-Builder
Code Pull Requests Activity

Fixed gh-206 to insure that the placeholders are replaced on compilation

Browse Source
This commit is contained in:
Llewellyn van der Merwe 2017-12-29 13:20:14 +02:00
parent 36e18f0b30
commit 8367e633c8
No known key found for this signature in database
GPG Key ID: CAD7B16D27AF28C5
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -126,7 +126,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 28th December, 2017 + *Last Build*: 29th December, 2017
+ *Version*: 2.6.8 + *Version*: 2.6.8
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

2
admin/README.txt
View File

@ -126,7 +126,7 @@ Component Builder is mapped as a component in itself on my local development env
+ *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com) + *Author*: [Llewellyn van der Merwe](mailto:llewellyn@joomlacomponentbuilder.com)
+ *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *Name*: [Component Builder](http://joomlacomponentbuilder.com)
+ *First Build*: 30th April, 2015 + *First Build*: 30th April, 2015
+ *Last Build*: 28th December, 2017 + *Last Build*: 29th December, 2017
+ *Version*: 2.6.8 + *Version*: 2.6.8
+ *Copyright*: Copyright (C) 2015. All Rights Reserved + *Copyright*: Copyright (C) 2015. All Rights Reserved
+ *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html

4
admin/assets/js/get_snippets.js
View File

@ -400,7 +400,7 @@ function bulkSnippetGithub(status) {
function doBulkUpdate_server(path, status) { function doBulkUpdate_server(path, status) {
// set the ajax scope // set the ajax scope
ajaxcall = null; ajaxcall = null;
var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json";
if (token.length > 0 && path.length > 0 && status.length > 0) { if (token.length > 0 && path.length > 0 && status.length > 0) {
var request = 'token='+token+'&path='+path+'&status='+status; var request = 'token='+token+'&path='+path+'&status='+status;
} }
@ -437,7 +437,7 @@ function setSnippetGithub(key, status) {
function setSnippetGithub_server(path, status) { function setSnippetGithub_server(path, status) {
// set the ajax scope // set the ajax scope
ajaxcall = null; ajaxcall = null;
var getUrl = "index.php?option=com_[[[component]]]&task=ajax.setSnippetGithub&format=json"; var getUrl = "index.php?option=com_componentbuilder&task=ajax.setSnippetGithub&format=json";
if (token.length > 0 && path.length > 0 && status.length > 0) { if (token.length > 0 && path.length > 0 && status.length > 0) {
var request = 'token='+token+'&path='+path+'&status='+status; var request = 'token='+token+'&path='+path+'&status='+status;
} }

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

@ -3339,7 +3339,8 @@ class Interpretation extends Fields
$path = '/administrator/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js'; $path = '/administrator/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js';
} }
// add script to file // add script to file
$this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###'] = $view['settings']->javascript_file; $this->fileContentDynamic[$view['settings']->code]['###' . $TARGET . '_JAVASCRIPT_FILE###']
= $this->setPlaceholders($view['settings']->javascript_file, $this->placeholders);
// add script to view // add script to view
return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path); return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path);
} }

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="3.2" method="upgrade"> <extension type="component" version="3.2" method="upgrade">
<name>COM_COMPONENTBUILDER</name> <name>COM_COMPONENTBUILDER</name>
<creationDate>28th December, 2017</creationDate> <creationDate>29th December, 2017</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://joomlacomponentbuilder.com</authorUrl> <authorUrl>http://joomlacomponentbuilder.com</authorUrl>