From fb7b5027c27585324eb172edd5cb7664056027ed Mon Sep 17 00:00:00 2001
From: Llewellyn van der Merwe <llewellyn@vdm.io>
Date: Sat, 5 Aug 2017 12:28:24 +0100
Subject: [PATCH] improved the answer for gh-106 to insure the correct form is
 submitted on compile

---
 README.md                             |  2 +-
 admin/README.txt                      |  2 +-
 admin/assets/css/compiler.css         |  2 +-
 admin/controllers/compiler.php        |  2 +-
 admin/models/compiler.php             |  2 +-
 admin/views/compiler/tmpl/default.php | 28 +++++++++++----------------
 admin/views/compiler/view.html.php    |  2 +-
 7 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index 667c57f15..94d0e57ae 100644
--- a/README.md
+++ b/README.md
@@ -112,7 +112,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.4.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*: **106286**
++ *Line count*: **106280**
 + *File count*: **650**
 + *Folder count*: **115**
 
diff --git a/admin/README.txt b/admin/README.txt
index 667c57f15..94d0e57ae 100644
--- a/admin/README.txt
+++ b/admin/README.txt
@@ -112,7 +112,7 @@ Component Builder is mapped as a component in itself on my local development env
 + *Version*: 2.4.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*: **106286**
++ *Line count*: **106280**
 + *File count*: **650**
 + *Folder count*: **115**
 
diff --git a/admin/assets/css/compiler.css b/admin/assets/css/compiler.css
index 6e982a8d9..38ba14c89 100644
--- a/admin/assets/css/compiler.css
+++ b/admin/assets/css/compiler.css
@@ -9,7 +9,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 51 of this MVC
+	@version		@update number 53 of this MVC
 	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
diff --git a/admin/controllers/compiler.php b/admin/controllers/compiler.php
index 0ddb9a322..20833f1b0 100644
--- a/admin/controllers/compiler.php
+++ b/admin/controllers/compiler.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 51 of this MVC
+	@version		@update number 53 of this MVC
 	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
diff --git a/admin/models/compiler.php b/admin/models/compiler.php
index 1fed4401c..142d7d20e 100644
--- a/admin/models/compiler.php
+++ b/admin/models/compiler.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 51 of this MVC
+	@version		@update number 53 of this MVC
 	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
diff --git a/admin/views/compiler/tmpl/default.php b/admin/views/compiler/tmpl/default.php
index 57dc131b4..2471038c5 100644
--- a/admin/views/compiler/tmpl/default.php
+++ b/admin/views/compiler/tmpl/default.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 51 of this MVC
+	@version		@update number 53 of this MVC
 	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder
@@ -36,25 +36,13 @@ JHtml::_('behavior.formvalidation');
 JHtml::_('formbehavior.chosen', 'select');
 JHtml::_('behavior.keepalive');
 ?>
-<?php if ($this->canDo->get('compiler.access')): ?>
-<script type="text/javascript">
-	Joomla.submitbutton = function(task) {
-		if (task === 'compiler.back') {
-			parent.history.back();
-			return false;
-		} else {
-			var form = document.getElementById('adminForm');
-			form.task.value = task;
-			form.submit();
-		}
-	}
-</script>
+<?php if ($this->canDo->get('compiler.access')): ?>
 <form action="<?php echo JRoute::_('index.php?option=com_componentbuilder&view=compiler'); ?>" method="post" name="adminForm" id="adminForm" class="form-validate" enctype="multipart/form-data">
         <input type="hidden" name="task" value="" />
         <?php echo JHtml::_('form.token'); ?>
 </form>
 <script type="text/javascript">
-Joomla.submitbutton2 = function(task)
+Joomla.submitbutton = function(task)
 {
 	if (task == ''){
 		return false;
@@ -67,9 +55,15 @@ Joomla.submitbutton2 = function(task)
 		}
 		if (isValid){
 			jQuery('#form').hide();
-			var form = document.getElementById('compilerForm');
+			// get correct form based on task
+			if (task == 'compiler.compiler') {
+				var form = document.getElementById('compilerForm');
+			} else {
+				var form = document.getElementById('adminForm');
+			}
 			form.task.value = task;
 			form.submit();
+			// some ui movements
 			if (task == 'compiler.compiler'){
 				jQuery('#compiler').show();
 			} else if (task == 'compiler.clearTmp'){
@@ -128,7 +122,7 @@ jQuery(document).ready(function($) {
 				</div>
 				<br />
 				<div class="clearfix"></div>
-				<button class="btn btn-small btn-success" onclick="Joomla.submitbutton2('compiler.compiler')"><span class="icon-cog icon-white"></span>
+				<button class="btn btn-small btn-success" onclick="Joomla.submitbutton('compiler.compiler')"><span class="icon-cog icon-white"></span>
 					<?php echo JText::_('COM_COMPONENTBUILDER_COMPILE_COMPONENT'); ?>
 				</button>
 				<input type="hidden" name="version" value="3" />
diff --git a/admin/views/compiler/view.html.php b/admin/views/compiler/view.html.php
index 524fe845a..44dbc9a38 100644
--- a/admin/views/compiler/view.html.php
+++ b/admin/views/compiler/view.html.php
@@ -10,7 +10,7 @@
                                                         |_| 				
 /-------------------------------------------------------------------------------------------------------------------------------/
 
-	@version		@update number 51 of this MVC
+	@version		@update number 53 of this MVC
 	@build			5th August, 2017
 	@created		1st February, 2017
 	@package		Component Builder