joomla/Component-Builder
joomla/Component-Builder
39
23
Fork 11
Code Issues 83 Pull Requests Projects 4 Wiki Activity

Compiler cross-browser fix, zero order fix, typo fix and improved default values. #109

Merged
Llewellyn merged 4 commits from staging into master 2017-08-13 10:09:44 +00:00
Conversation 2 Commits 4 Files Changed 213 +17 -23
7 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fb7b5027c2 - Show all commits

2
README.md
View File

@ -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**

2
admin/README.txt
View File

@ -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**

2
admin/assets/css/compiler.css
View File

@ -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

2
admin/controllers/compiler.php
View File

@ -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

2
admin/models/compiler.php
View File

@ -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

28
admin/views/compiler/tmpl/default.php
View File

@ -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" />

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

@ -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