From 8367e633c837de5571ac7fab0548d8dee7b30d3f Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 29 Dec 2017 13:20:14 +0200 Subject: [PATCH 1/2] Fixed gh-206 to insure that the placeholders are replaced on compilation --- README.md | 2 +- admin/README.txt | 2 +- admin/assets/js/get_snippets.js | 4 ++-- admin/helpers/compiler/e_Interpretation.php | 3 ++- componentbuilder.xml | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) 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 -- 2.40.1 From 423df415fa25a3088502e4765264d6ed72b3946e Mon Sep 17 00:00:00 2001 From: Llewellyn van der Merwe Date: Fri, 29 Dec 2017 17:42:54 +0200 Subject: [PATCH 2/2] Update to fix snippet manager links --- README.md | 8 ++++---- admin/README.txt | 8 ++++---- admin/sql/updates/mysql/2.6.8.sql | 1 + componentbuilder.xml | 4 ++-- componentbuilder_update_server.xml | 17 +++++++++++++++++ script.php | 2 +- 6 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 admin/sql/updates/mysql/2.6.8.sql diff --git a/README.md b/README.md index c61e2910c..1a987be40 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.8) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -127,12 +127,12 @@ Component Builder is mapped as a component in itself on my local development env + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 + *Last Build*: 29th December, 2017 -+ *Version*: 2.6.8 ++ *Version*: 2.6.9 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **178612** ++ *Line count*: **178630** + *Field count*: **1539** -+ *File count*: **1146** ++ *File count*: **1147** + *Folder count*: **184** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/README.txt b/admin/README.txt index c61e2910c..1a987be40 100644 --- a/admin/README.txt +++ b/admin/README.txt @@ -9,7 +9,7 @@ The Component Builder for [Joomla](https://extensions.joomla.org/extension/compo Whether you're a seasoned [Joomla](https://extensions.joomla.org/extension/component-builder/) developer, or have just started, Component Builder will safe you lots of time and money. A real must have! -You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.8) with **ALL** its features and **ALL** concepts totally open-source and free! +You can install it quite easily and with no limitations. On [github](https://github.com/vdm-io/Joomla-Component-Builder/releases) is the latest release (2.6.9) with **ALL** its features and **ALL** concepts totally open-source and free! > Watch Quick Build of a Hello World component in [JCB on Youtube](https://www.youtube.com/watch?v=IQfsLYIeblk&list=PLQRGFI8XZ_wtGvPQZWBfDzzlERLQgpMRE&index=45) @@ -127,12 +127,12 @@ Component Builder is mapped as a component in itself on my local development env + *Name*: [Component Builder](http://joomlacomponentbuilder.com) + *First Build*: 30th April, 2015 + *Last Build*: 29th December, 2017 -+ *Version*: 2.6.8 ++ *Version*: 2.6.9 + *Copyright*: Copyright (C) 2015. All Rights Reserved + *License*: GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html -+ *Line count*: **178612** ++ *Line count*: **178630** + *Field count*: **1539** -+ *File count*: **1146** ++ *File count*: **1147** + *Folder count*: **184** > This **component** was build with a Joomla [Automated Component Builder](http://joomlacomponentbuilder.com). diff --git a/admin/sql/updates/mysql/2.6.8.sql b/admin/sql/updates/mysql/2.6.8.sql new file mode 100644 index 000000000..d3f5a12fa --- /dev/null +++ b/admin/sql/updates/mysql/2.6.8.sql @@ -0,0 +1 @@ + diff --git a/componentbuilder.xml b/componentbuilder.xml index 313495db2..10157a2b7 100644 --- a/componentbuilder.xml +++ b/componentbuilder.xml @@ -7,9 +7,9 @@ http://joomlacomponentbuilder.com Copyright (C) 2015. All Rights Reserved GNU/GPL Version 2 or later - http://www.gnu.org/licenses/gpl-2.0.html - 2.6.8 + 2.6.9 Component Builder (v.2.6.8) +

Component Builder (v.2.6.9)

The Component Builder for [Joomla](https://extensions.joomla.org/extension/component-builder/) is highly advanced tool that is truly able to build extremely complex components in a fraction of the time. diff --git a/componentbuilder_update_server.xml b/componentbuilder_update_server.xml index d1ebf3648..fea5387e9 100644 --- a/componentbuilder_update_server.xml +++ b/componentbuilder_update_server.xml @@ -305,4 +305,21 @@ http://joomlacomponentbuilder.com + + Component Builder + Builds Complex Joomla Components + com_componentbuilder + component + 2.6.9 + http://joomlacomponentbuilder.com + + https://github.com/vdm-io/Joomla-Component-Builder/releases/download/v2.6.9/JCB_v2.6.9.zip + + + stable + + Llewellyn van der Merwe + http://joomlacomponentbuilder.com + + \ No newline at end of file diff --git a/script.php b/script.php index f29f709c9..7e5ded3c1 100644 --- a/script.php +++ b/script.php @@ -4739,7 +4739,7 @@ class com_componentbuilderInstallerScript echo ' -

Upgrade to Version 2.6.8 Was Successful! Let us know if anything is not working as expected.

'; +

Upgrade to Version 2.6.9 Was Successful! Let us know if anything is not working as expected.

'; } } } -- 2.40.1