diff --git a/README.md b/README.md index 04f225e4c..c61e2910c 100644 --- a/README.md +++ b/README.md @@ -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) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 28th December, 2017 ++ *Last Build*: 29th December, 2017 + *Version*: 2.6.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/README.txt b/admin/README.txt index 04f225e4c..c61e2910c 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -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) + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 -+ *Last Build*: 28th December, 2017 ++ *Last Build*: 29th December, 2017 + *Version*: 2.6.8 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html diff --git a/admin/assets/js/get_snippets.js b/admin/assets/js/get_snippets.js index 21cdae162..8daa4cbf5 100644 --- a/admin/assets/js/get_snippets.js +++ b/admin/assets/js/get_snippets.js @@ -400,7 +400,7 @@ function bulkSnippetGithub(status) { function doBulkUpdate_server(path, status) { // set the ajax scope 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) { var request = 'token='+token+'&path='+path+'&status='+status; } @@ -437,7 +437,7 @@ function setSnippetGithub(key, status) { function setSnippetGithub_server(path, status) { // set the ajax scope 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) { var request = 'token='+token+'&path='+path+'&status='+status; } diff --git a/admin/helpers/compiler/e_Interpretation.php b/admin/helpers/compiler/e_Interpretation.php index 0eff7432d..b744798b7 100644 --- a/admin/helpers/compiler/e_Interpretation.php +++ b/admin/helpers/compiler/e_Interpretation.php @@ -3339,7 +3339,8 @@ class Interpretation extends Fields $path = '/administrator/components/com_' . $this->fileContentStatic['###component###'] . '/assets/js/' . $view['settings']->code . '.js'; } // 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 return PHP_EOL . PHP_EOL . "\t\t//" . $this->setLine(__LINE__) . " Add View JavaScript File" . PHP_EOL . "\t\t" . $this->setIncludeLibScript($path); } diff --git a/componentbuilder.xml b/componentbuilder.xml index 2767ad54b..313495db2 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -1,7 +1,7 @@ COM_COMPONENTBUILDER - 28th December, 2017 + 29th December, 2017 Llewellyn van der Merwe llewellyn@joomlacomponentbuilder.com http://joomlacomponentbuilder.com