joomla/Component-Builder
40
26
Fork 12
Code Issues 82 Pull Requests 2 Projects 4 Wiki Activity

Further improved #37 to ensure language strings are set and reversed, also add extra buttons to the compiler page. Major restructure of custom code implementation to make it more stable. Resolved #40 by updating the default field sql values.

Browse Source
This commit is contained in:
Llewellyn van der Merwe
2017-02-14 01:24:38 +02:00
parent de008d5907
commit 290a51dd5a
247 changed files with 2394 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
admin/models/ajax.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage ajax.php
@@ -1262,10 +1262,6 @@ class ComponentbuilderModelAjax extends JModelList
return $db->loadResult();
}
return '';
}
protected function splitAtUpperCase($s) {
return preg_split('/(?=[A-Z])/', $s, -1, PREG_SPLIT_NO_EMPTY);
}
// Used in dynamic_get
@@ -1438,6 +1434,37 @@ class ComponentbuilderModelAjax extends JModelList
return false;
}
// Used in custom_code
public function checkFunctionName($name, $id)
{
$nameArray = (array) $this->splitAtUpperCase($name);
$name = ComponentbuilderHelper::safeString(implode(' ', $nameArray), 'cA');
if ($found = ComponentbuilderHelper::getVar('custom_code', $name, 'function_name', 'id'))
{
if ((int) $id !== (int) $found)
{
return array (
'message' => JText::_('COM_COMPONENTBUILDER_SORRY_THIS_FUNCTION_NAME_IS_ALREADY_IN_USE'),
'status' => 'danger');
}
}
return array (
'name' => $name,
'message' => JText::_('COM_COMPONENTBUILDER_GREAT_THIS_FUNCTION_NAME_WILL_WORK'),
'status' => 'success');
}
protected function splitAtUpperCase($string)
{
return preg_split('/(?=[A-Z])/', $string, -1, PREG_SPLIT_NO_EMPTY);
}
public function usedin($name, $id)
{
// search where this function is being used
return array('in' => 'Soon we will show where this function is being used');
}
// Used in field
public function getFieldOptions($id)
{

21
admin/models/compiler.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 11 of this MVC
@build 2nd February, 2017
@version @update number 17 of this MVC
@build 13th February, 2017
@created 1st February, 2017
@package Component Builder
@subpackage compiler.php
@@ -163,14 +163,16 @@ class ComponentbuilderModelCompiler extends JModelList
return $db->loadObjectList();
}
public function builder($version,$id,$backup,$git)
public function builder($version, $id, $backup, $git, $addPlaceholders, $debugLinenr)
{
$set['joomlaVersion'] = $version;
$set['componentId'] = $id;
$set['addBackup'] = $backup;
$set['addGit'] = $git;
$set['joomlaVersion'] = $version;
$set['componentId'] = $id;
$set['addBackup'] = $backup;
$set['addGit'] = $git;
$set['addPlaceholders'] = $addPlaceholders;
$set['debugLinenr'] = $debugLinenr;
// start up Compiler
$this->compiler = new Compiler($set);
$this->compiler = new Compiler($set);
if($this->compiler){
return true;
}
@@ -184,7 +186,8 @@ class ComponentbuilderModelCompiler extends JModelList
'files' => $this->compiler->fileCount,
'folders' => $this->compiler->folderCount,
'filePath' => $this->compiler->filepath,
'filename' => $this->compiler->componentFolderName
'filename' => $this->compiler->componentFolderName,
'time' => $this->compiler->secondsCompiled
);
}

2
admin/models/component.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 81 of this MVC
@build 3rd February, 2017
@build 13th February, 2017
@created 6th May, 2015
@package Component Builder
@subpackage component.php

4
admin/models/componentbuilder.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage componentbuilder.php

2
admin/models/components.php
View File

@@ -11,7 +11,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 81 of this MVC
@build 3rd February, 2017
@build 13th February, 2017
@created 6th May, 2015
@package Component Builder
@subpackage components.php

4
admin/models/custom_code.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 35 of this MVC
@build 10th February, 2017
@version @update number 55 of this MVC
@build 13th February, 2017
@created 11th October, 2016
@package Component Builder
@subpackage custom_code.php

49
admin/models/custom_codes.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 35 of this MVC
@build 10th February, 2017
@version @update number 55 of this MVC
@build 13th February, 2017
@created 11th October, 2016
@package Component Builder
@subpackage custom_codes.php
@@ -47,7 +47,8 @@ class ComponentbuilderModelCustom_codes extends JModelList
'a.component','component',
'a.path','path',
'a.target','target',
'a.type','type'
'a.type','type',
'a.comment_type','comment_type'
);
}
@@ -78,7 +79,10 @@ class ComponentbuilderModelCustom_codes extends JModelList
$this->setState('filter.target', $target);
$type = $this->getUserStateFromRequest($this->context . '.filter.type', 'filter_type');
$this->setState('filter.type', $type);
$this->setState('filter.type', $type);
$comment_type = $this->getUserStateFromRequest($this->context . '.filter.comment_type', 'filter_comment_type');
$this->setState('filter.comment_type', $comment_type);
$sorting = $this->getUserStateFromRequest($this->context . '.filter.sorting', 'filter_sorting', 0, 'int');
$this->setState('filter.sorting', $sorting);
@@ -140,6 +144,10 @@ class ComponentbuilderModelCustom_codes extends JModelList
{
$item->component_system_name = $item->system_name;
$item->path = '<code>[CUSTO'.'MCODE='.$item->id.']</code>'; // so it is not detected
if (ComponentbuilderHelper::checkString($item->function_name))
{
$item->path = '<code>[CUSTO'.'MCODE='.$item->function_name.']</code>'; // so it is not detected
}
$item->type = 2;
}
}
@@ -154,6 +162,8 @@ class ComponentbuilderModelCustom_codes extends JModelList
$item->target = $this->selectionTranslation($item->target, 'target');
// convert type
$item->type = $this->selectionTranslation($item->type, 'type');
// convert comment_type
$item->comment_type = $this->selectionTranslation($item->comment_type, 'comment_type');
}
}
@@ -173,8 +183,8 @@ class ComponentbuilderModelCustom_codes extends JModelList
if ($name === 'target')
{
$targetArray = array(
1 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION',
2 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL'
2 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL',
1 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION'
);
// Now check if value is found in this array
if (isset($targetArray[$value]) && ComponentbuilderHelper::checkString($targetArray[$value]))
@@ -195,6 +205,19 @@ class ComponentbuilderModelCustom_codes extends JModelList
return $typeArray[$value];
}
}
// Array of comment_type language strings
if ($name === 'comment_type')
{
$comment_typeArray = array(
1 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS',
2 => 'COM_COMPONENTBUILDER_CUSTOM_CODE_HTML'
);
// Now check if value is found in this array
if (isset($comment_typeArray[$value]) && ComponentbuilderHelper::checkString($comment_typeArray[$value]))
{
return $comment_typeArray[$value];
}
}
return $value;
}
@@ -257,7 +280,7 @@ class ComponentbuilderModelCustom_codes extends JModelList
else
{
$search = $db->quote('%' . $db->escape($search) . '%');
$query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.')');
$query->where('(a.component LIKE '.$search.' OR g.system_name LIKE '.$search.' OR a.comment_type LIKE '.$search.')');
}
}
@@ -276,6 +299,11 @@ class ComponentbuilderModelCustom_codes extends JModelList
{
$query->where('a.type = ' . $db->quote($db->escape($type)));
}
// Filter by Comment_type.
if ($comment_type = $this->getState('filter.comment_type'))
{
$query->where('a.comment_type = ' . $db->quote($db->escape($comment_type)));
}
// Add the list ordering clause.
$orderCol = $this->state->get('list.ordering', 'a.id');
@@ -366,6 +394,10 @@ class ComponentbuilderModelCustom_codes extends JModelList
{
$item->component_system_name = $item->system_name;
$item->path = '<code>[CUSTO'.'MCODE='.$item->id.']</code>'; // so it is not detected
if (ComponentbuilderHelper::checkString($item->function_name))
{
$item->path = '<code>[CUSTO'.'MCODE='.$item->function_name.']</code>'; // so it is not detected
}
$item->type = 2;
}
}
@@ -421,7 +453,8 @@ class ComponentbuilderModelCustom_codes extends JModelList
$id .= ':' . $this->getState('filter.component');
$id .= ':' . $this->getState('filter.path');
$id .= ':' . $this->getState('filter.target');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.type');
$id .= ':' . $this->getState('filter.comment_type');
return parent::getStoreId($id);
}

2
admin/models/field.php
View File

@@ -141,7 +141,7 @@ class ComponentbuilderModelField extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getVzvlinked_admin_views()
public function getVzwlinked_admin_views()
{
// Get the user object.
$user = JFactory::getUser();

4
admin/models/fields/adminviewfolderlist.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviewfolderlist.php

4
admin/models/fields/adminviews.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage adminviews.php

4
admin/models/fields/articles.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage articles.php

4
admin/models/fields/component.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage component.php

4
admin/models/fields/customadminviews.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customadminviews.php

4
admin/models/fields/customfilelist.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfilelist.php

4
admin/models/fields/customfolderlist.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customfolderlist.php

4
admin/models/fields/customgets.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage customgets.php

4
admin/models/fields/dbtables.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dbtables.php

4
admin/models/fields/dynamicgets.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage dynamicgets.php

4
admin/models/fields/fields.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fields.php

4
admin/models/fields/fieldsmulti.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldsmulti.php

4
admin/models/fields/fieldtypes.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage fieldtypes.php

4
admin/models/fields/maingets.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage maingets.php

4
admin/models/fields/siteviewfolderlist.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviewfolderlist.php

4
admin/models/fields/siteviews.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage siteviews.php

4
admin/models/fields/snippets.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage snippets.php

12
admin/models/fieldtype.php
View File

@@ -111,7 +111,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return mixed An array of data items on success, false on failure.
*/
public function getVzwfields()
public function getVzxfields()
{
// Get the user object.
$user = JFactory::getUser();
@@ -195,13 +195,13 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
foreach ($items as $nr => &$item)
{
// convert datatype
$item->datatype = $this->selectionTranslationVzwfields($item->datatype, 'datatype');
$item->datatype = $this->selectionTranslationVzxfields($item->datatype, 'datatype');
// convert indexes
$item->indexes = $this->selectionTranslationVzwfields($item->indexes, 'indexes');
$item->indexes = $this->selectionTranslationVzxfields($item->indexes, 'indexes');
// convert null_switch
$item->null_switch = $this->selectionTranslationVzwfields($item->null_switch, 'null_switch');
$item->null_switch = $this->selectionTranslationVzxfields($item->null_switch, 'null_switch');
// convert store
$item->store = $this->selectionTranslationVzwfields($item->store, 'store');
$item->store = $this->selectionTranslationVzxfields($item->store, 'store');
}
}
@@ -215,7 +215,7 @@ class ComponentbuilderModelFieldtype extends JModelAdmin
*
* @return translatable string
*/
public function selectionTranslationVzwfields($value,$name)
public function selectionTranslationVzxfields($value,$name)
{
// Array of datatype language strings
if ($name === 'datatype')

2
admin/models/forms/component.js
View File

@@ -10,7 +10,7 @@
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 81 of this MVC
@build 3rd February, 2017
@build 13th February, 2017
@created 6th May, 2015
@package Component Builder
@subpackage component.js

149
admin/models/forms/custom_code.js
View File

@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 35 of this MVC
@build 10th February, 2017
@version @update number 55 of this MVC
@build 13th February, 2017
@created 11th October, 2016
@package Component Builder
@subpackage custom_code.js
@@ -23,9 +23,10 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
jform_vvvvvzpvzk_required = false;
jform_vvvvvzovzk_required = false;
jform_vvvvvzpvzl_required = false;
jform_vvvvvzpvzm_required = false;
jform_vvvvvzpvzn_required = false;
// Initial Script
jQuery(document).ready(function()
@@ -51,11 +52,30 @@ function vvvvvzo(target_vvvvvzo)
// set the function logic
if (target_vvvvvzo == 2)
{
jQuery('#jform_function_name').closest('.control-group').show();
if (jform_vvvvvzovzk_required)
{
updateFieldRequired('function_name',0);
jQuery('#jform_function_name').prop('required','required');
jQuery('#jform_function_name').attr('aria-required',true);
jQuery('#jform_function_name').addClass('required');
jform_vvvvvzovzk_required = false;
}
jQuery('.note_jcb_placeholder').closest('.control-group').show();
jQuery('#jform_system_name').closest('.control-group').show();
}
else
{
jQuery('#jform_function_name').closest('.control-group').hide();
if (!jform_vvvvvzovzk_required)
{
updateFieldRequired('function_name',1);
jQuery('#jform_function_name').removeAttr('required');
jQuery('#jform_function_name').removeAttr('aria-required');
jQuery('#jform_function_name').removeClass('required');
jform_vvvvvzovzk_required = true;
}
jQuery('.note_jcb_placeholder').closest('.control-group').hide();
jQuery('#jform_system_name').closest('.control-group').hide();
}
@@ -68,70 +88,70 @@ function vvvvvzp(target_vvvvvzp)
if (target_vvvvvzp == 1)
{
jQuery('#jform_component').closest('.control-group').show();
if (jform_vvvvvzpvzk_required)
if (jform_vvvvvzpvzl_required)
{
updateFieldRequired('component',0);
jQuery('#jform_component').prop('required','required');
jQuery('#jform_component').attr('aria-required',true);
jQuery('#jform_component').addClass('required');
jform_vvvvvzpvzk_required = false;
jform_vvvvvzpvzl_required = false;
}
jQuery('#jform_path').closest('.control-group').show();
if (jform_vvvvvzpvzl_required)
if (jform_vvvvvzpvzm_required)
{
updateFieldRequired('path',0);
jQuery('#jform_path').prop('required','required');
jQuery('#jform_path').attr('aria-required',true);
jQuery('#jform_path').addClass('required');
jform_vvvvvzpvzl_required = false;
jform_vvvvvzpvzm_required = false;
}
jQuery('#jform_from_line').closest('.control-group').show();
jQuery('#jform_hashtarget').closest('.control-group').show();
jQuery('#jform_to_line').closest('.control-group').show();
jQuery('#jform_type').closest('.control-group').show();
if (jform_vvvvvzpvzm_required)
if (jform_vvvvvzpvzn_required)
{
updateFieldRequired('type',0);
jQuery('#jform_type').prop('required','required');
jQuery('#jform_type').attr('aria-required',true);
jQuery('#jform_type').addClass('required');
jform_vvvvvzpvzm_required = false;
jform_vvvvvzpvzn_required = false;
}
}
else
{
jQuery('#jform_component').closest('.control-group').hide();
if (!jform_vvvvvzpvzk_required)
if (!jform_vvvvvzpvzl_required)
{
updateFieldRequired('component',1);
jQuery('#jform_component').removeAttr('required');
jQuery('#jform_component').removeAttr('aria-required');
jQuery('#jform_component').removeClass('required');
jform_vvvvvzpvzk_required = true;
jform_vvvvvzpvzl_required = true;
}
jQuery('#jform_path').closest('.control-group').hide();
if (!jform_vvvvvzpvzl_required)
if (!jform_vvvvvzpvzm_required)
{
updateFieldRequired('path',1);
jQuery('#jform_path').removeAttr('required');
jQuery('#jform_path').removeAttr('aria-required');
jQuery('#jform_path').removeClass('required');
jform_vvvvvzpvzl_required = true;
jform_vvvvvzpvzm_required = true;
}
jQuery('#jform_from_line').closest('.control-group').hide();
jQuery('#jform_hashtarget').closest('.control-group').hide();
jQuery('#jform_to_line').closest('.control-group').hide();
jQuery('#jform_type').closest('.control-group').hide();
if (!jform_vvvvvzpvzm_required)
if (!jform_vvvvvzpvzn_required)
{
updateFieldRequired('type',1);
jQuery('#jform_type').removeAttr('required');
jQuery('#jform_type').removeAttr('aria-required');
jQuery('#jform_type').removeClass('required');
jform_vvvvvzpvzm_required = true;
jform_vvvvvzpvzn_required = true;
}
}
}
@@ -202,4 +222,103 @@ function isSet(val)
return true;
}
return false;
}
jQuery(document).ready(function()
{
var target = jQuery("#jform_target input[type='radio']:checked").val();
if (target == 2) {
var functioName = jQuery('#jform_function_name').val();
// check if this function name is taken
checkFunctionName(functioName);
}
});
function setCustomCodePlaceholder() {
var ide = jQuery('#jform_id').val();
var functioName = jQuery('#jform_function_name').val();
if (ide > 0 && functioName.length > 2) {
jQuery('#jcb-placeholder').html('<code>[CUSTO'+'MCODE='+ide+']</code> or <code>[CUSTO'+'MCODE='+functioName+']</code>');
jQuery('#jcb-placeholder-arg').html('<code>[CUSTO'+'MCODE='+ide+'&#43;value1,value2]</code> or <code>[CUSTO'+'MCODE='+functioName+'&#43;value1,value2]</code>');
} else if (ide > 0){
jQuery('#jcb-placeholder').html('<code>[CUSTO'+'MCODE='+ide+']</code> or <code>[not ready]</code>');
jQuery('#jcb-placeholder-arg').html('<code>[CUSTO'+'MCODE='+ide+'&#43;value1,value2]</code> or <code>[not ready]</code>');
} else if (functioName.length > 2) {
jQuery('#jcb-placeholder').html('<code>[save to see]</code> or <code>[CUSTO'+'MCODE='+functioName+']</code>');
jQuery('#jcb-placeholder-arg').html('<code>[save to see]</code> or <code>[CUSTO'+'MCODE='+functioName+'&#43;value1,value2]</code>');
} else {
jQuery('#jcb-placeholder').html('<code>[save to see]</code>');
jQuery('#jcb-placeholder-arg').html('<code>[save to see]</code>');
}
// update the notes
if (ide > 0) {
jQuery('.placeholder-key-id').text(ide);
}
}
function checkFunctionName(functioName) {
if (functioName.length > 2) {
var ide = jQuery('#jform_id').val();
if (ide == 0) {
ide = -1;
}
checkFunctionName_server(functioName, ide).done(function(result) {
if(result.name && result.message){
// show notice that functioName is okay
jQuery.UIkit.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'});
jQuery('#jform_function_name').val(result.name);
// now start search for where the function is used
usedin(result.name, ide);
} else if(result.message){
// show notice that functioName is not okay
jQuery.UIkit.notify({message: result.message, timeout: 5000, status: result.status, pos: 'top-right'});
jQuery('#jform_function_name').val('');
} else {
// set an error that message was not send
jQuery.UIkit.notify({message: 'Function name already taken, please try again.', timeout: 5000, status: 'danger', pos: 'top-right'});
jQuery('#jform_function_name').val('');
}
// set custom code placeholder
setCustomCodePlaceholder();
});
} else {
// set an error that message was not send
jQuery.UIkit.notify({message: 'You must add an unique function name.', timeout: 5000, status: 'danger', pos: 'top-right'});
jQuery('#jform_function_name').val('');
// set custom code placeholder
setCustomCodePlaceholder();
}
}
// check Function Name
function checkFunctionName_server(functioName, ide){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.checkFunctionName&format=json";
if(token.length > 0){
var request = 'token='+token+'&functioName='+functioName+'&id='+ide;
}
return jQuery.ajax({
type: 'POST',
url: getUrl,
dataType: 'jsonp',
data: request,
jsonp: 'callback'
});
}
// check where this Function is used
function usedin(functioName, ide) {
usedin_server(functioName, ide).done(function(used) {
if (used.in) {
jQuery('#usedin').html(used.in);
}
});
}
function usedin_server(functioName, ide){
var getUrl = "index.php?option=com_componentbuilder&task=ajax.usedin&format=json";
if(token.length > 0){
var request = 'token='+token+'&functioName='+functioName+'&id='+ide;
}
return jQuery.ajax({
type: 'POST',
url: getUrl,
dataType: 'jsonp',
data: request,
jsonp: 'callback'
});
}

119
admin/models/forms/custom_code.xml
View File

@@ -123,12 +123,12 @@
label="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_LABEL"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_TARGET_DESCRIPTION"
class="btn-group btn-group-yesno"
default="1">
default="2">
<!-- Option Set. -->
<option value="1">
COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
<option value="2">
COM_COMPONENTBUILDER_CUSTOM_CODE_JCB_MANUAL</option>
<option value="1">
COM_COMPONENTBUILDER_CUSTOM_CODE_HASH_AUTOMATION</option>
</field>
<!-- Type Field. Type: Radio. (joomla) -->
<field
@@ -144,45 +144,34 @@
<option value="2">
COM_COMPONENTBUILDER_CUSTOM_CODE_INSERTION</option>
</field>
<!-- Code Field. Type: Textarea. (joomla) -->
<!-- Comment_type Field. Type: Radio. (joomla) -->
<field
type="textarea"
name="code"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
rows="30"
cols="15"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
required="true"
/>
<!-- To_line Field. Type: Text. (joomla) -->
type="radio"
name="comment_type"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_LABEL"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_COMMENT_TYPE_DESCRIPTION"
class="btn-group btn-group-yesno"
default="1"
required="true">
<!-- Option Set. -->
<option value="1">
COM_COMPONENTBUILDER_CUSTOM_CODE_PHPJS</option>
<option value="2">
COM_COMPONENTBUILDER_CUSTOM_CODE_HTML</option>
</field>
<!-- Hashendtarget Field. Type: Text. (joomla) -->
<field
type="text"
name="to_line"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
class="text_area"
filter="FLOAT"
message="Error! Please add line number here."
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
/>
<!-- System_name Field. Type: Text. (joomla) -->
<field
type="text"
name="system_name"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
name="hashendtarget"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
size="50"
maxlength="150"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
class="text_area"
readonly="true"
filter="STRING"
message="Error! Please add some text here."
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT"
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT"
/>
<!-- Hashtarget Field. Type: Text. (joomla) -->
<field
@@ -198,21 +187,59 @@
message="Error! Please add some text here."
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHTARGET_HINT"
/>
<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
<!-- Hashendtarget Field. Type: Text. (joomla) -->
<!-- Function_name Field. Type: Text. (joomla) -->
<field
type="text"
name="hashendtarget"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_LABEL"
size="50"
maxlength="150"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_DESCRIPTION"
name="function_name"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_LABEL"
size="40"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_FUNCTION_NAME_DESCRIPTION"
class="input-large-text"
required="true"
/>
<!-- Note_placeholders_explained Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_placeholders_explained" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_PLACEHOLDERS_EXPLAINED_DESCRIPTION" heading="h4" class="note_placeholders_explained" />
<!-- System_name Field. Type: Text. (joomla) -->
<field
type="text"
name="system_name"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_DESCRIPTION"
class="text_area"
readonly="true"
filter="STRING"
message="Error! Please add some text here."
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_HASHENDTARGET_HINT"
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_SYSTEM_NAME_HINT"
/>
<!-- To_line Field. Type: Text. (joomla) -->
<field
type="text"
name="to_line"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_LABEL"
size="10"
maxlength="50"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_DESCRIPTION"
class="text_area"
filter="FLOAT"
message="Error! Please add line number here."
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_TO_LINE_HINT"
onchange="if(!jQuery(this).val().match(/^\d+$/)){jQuery(this).val('')};"
/>
<!-- Note_jcb_placeholder Field. Type: Note. A None Database Field. (joomla) -->
<field type="note" name="note_jcb_placeholder" label="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_LABEL" description="COM_COMPONENTBUILDER_CUSTOM_CODE_NOTE_JCB_PLACEHOLDER_DESCRIPTION" heading="h4" class="span12 note_jcb_placeholder" />
<!-- Code Field. Type: Textarea. (joomla) -->
<field
type="textarea"
name="code"
label="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_LABEL"
rows="30"
cols="15"
description="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_DESCRIPTION"
class="text_area span12"
filter="raw"
hint="COM_COMPONENTBUILDER_CUSTOM_CODE_CODE_HINT"
required="true"
/>
<!-- From_line Field. Type: Text. (joomla) -->
<field

80
admin/models/forms/field.js
View File

@@ -23,14 +23,14 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
jform_vvvvvzsvzn_required = false;
jform_vvvvvztvzo_required = false;
jform_vvvvvzuvzp_required = false;
jform_vvvvvzvvzq_required = false;
jform_vvvvvzyvzr_required = false;
jform_vvvvvzzvzs_required = false;
jform_vvvvwaavzt_required = false;
jform_vvvvwabvzu_required = false;
jform_vvvvvzsvzo_required = false;
jform_vvvvvztvzp_required = false;
jform_vvvvvzuvzq_required = false;
jform_vvvvvzvvzr_required = false;
jform_vvvvvzyvzs_required = false;
jform_vvvvvzzvzt_required = false;
jform_vvvvwaavzu_required = false;
jform_vvvvwabvzv_required = false;
// Initial Script
jQuery(document).ready(function()
@@ -84,26 +84,26 @@ function vvvvvzs(datalenght_vvvvvzs)
if (datalenght)
{
jQuery('#jform_datalenght_other').closest('.control-group').show();
if (jform_vvvvvzsvzn_required)
if (jform_vvvvvzsvzo_required)
{
updateFieldRequired('datalenght_other',0);
jQuery('#jform_datalenght_other').prop('required','required');
jQuery('#jform_datalenght_other').attr('aria-required',true);
jQuery('#jform_datalenght_other').addClass('required');
jform_vvvvvzsvzn_required = false;
jform_vvvvvzsvzo_required = false;
}
}
else
{
jQuery('#jform_datalenght_other').closest('.control-group').hide();
if (!jform_vvvvvzsvzn_required)
if (!jform_vvvvvzsvzo_required)
{
updateFieldRequired('datalenght_other',1);
jQuery('#jform_datalenght_other').removeAttr('required');
jQuery('#jform_datalenght_other').removeAttr('aria-required');
jQuery('#jform_datalenght_other').removeClass('required');
jform_vvvvvzsvzn_required = true;
jform_vvvvvzsvzo_required = true;
}
}
}
@@ -139,26 +139,26 @@ function vvvvvzt(datadefault_vvvvvzt)
if (datadefault)
{
jQuery('#jform_datadefault_other').closest('.control-group').show();
if (jform_vvvvvztvzo_required)
if (jform_vvvvvztvzp_required)
{
updateFieldRequired('datadefault_other',0);
jQuery('#jform_datadefault_other').prop('required','required');
jQuery('#jform_datadefault_other').attr('aria-required',true);
jQuery('#jform_datadefault_other').addClass('required');
jform_vvvvvztvzo_required = false;
jform_vvvvvztvzp_required = false;
}
}
else
{
jQuery('#jform_datadefault_other').closest('.control-group').hide();
if (!jform_vvvvvztvzo_required)
if (!jform_vvvvvztvzp_required)
{
updateFieldRequired('datadefault_other',1);
jQuery('#jform_datadefault_other').removeAttr('required');
jQuery('#jform_datadefault_other').removeAttr('aria-required');
jQuery('#jform_datadefault_other').removeClass('required');
jform_vvvvvztvzo_required = true;
jform_vvvvvztvzp_required = true;
}
}
}
@@ -196,13 +196,13 @@ function vvvvvzu(datatype_vvvvvzu)
jQuery('#jform_datadefault').closest('.control-group').show();
jQuery('#jform_datalenght').closest('.control-group').show();
jQuery('#jform_indexes').closest('.control-group').show();
if (jform_vvvvvzuvzp_required)
if (jform_vvvvvzuvzq_required)
{
updateFieldRequired('indexes',0);
jQuery('#jform_indexes').prop('required','required');
jQuery('#jform_indexes').attr('aria-required',true);
jQuery('#jform_indexes').addClass('required');
jform_vvvvvzuvzp_required = false;
jform_vvvvvzuvzq_required = false;
}
}
@@ -211,13 +211,13 @@ function vvvvvzu(datatype_vvvvvzu)
jQuery('#jform_datadefault').closest('.control-group').hide();
jQuery('#jform_datalenght').closest('.control-group').hide();
jQuery('#jform_indexes').closest('.control-group').hide();
if (!jform_vvvvvzuvzp_required)
if (!jform_vvvvvzuvzq_required)
{
updateFieldRequired('indexes',1);
jQuery('#jform_indexes').removeAttr('required');
jQuery('#jform_indexes').removeAttr('aria-required');
jQuery('#jform_indexes').removeClass('required');
jform_vvvvvzuvzp_required = true;
jform_vvvvvzuvzq_required = true;
}
}
}
@@ -253,26 +253,26 @@ function vvvvvzv(datatype_vvvvvzv)
if (datatype)
{
jQuery('#jform_store').closest('.control-group').show();
if (jform_vvvvvzvvzq_required)
if (jform_vvvvvzvvzr_required)
{
updateFieldRequired('store',0);
jQuery('#jform_store').prop('required','required');
jQuery('#jform_store').attr('aria-required',true);
jQuery('#jform_store').addClass('required');
jform_vvvvvzvvzq_required = false;
jform_vvvvvzvvzr_required = false;
}
}
else
{
jQuery('#jform_store').closest('.control-group').hide();
if (!jform_vvvvvzvvzq_required)
if (!jform_vvvvvzvvzr_required)
{
updateFieldRequired('store',1);
jQuery('#jform_store').removeAttr('required');
jQuery('#jform_store').removeAttr('aria-required');
jQuery('#jform_store').removeClass('required');
jform_vvvvvzvvzq_required = true;
jform_vvvvvzvvzr_required = true;
}
}
}
@@ -356,26 +356,26 @@ function vvvvvzy(add_css_view_vvvvvzy)
if (add_css_view_vvvvvzy == 1)
{
jQuery('#jform_css_view').closest('.control-group').show();
if (jform_vvvvvzyvzr_required)
if (jform_vvvvvzyvzs_required)
{
updateFieldRequired('css_view',0);
jQuery('#jform_css_view').prop('required','required');
jQuery('#jform_css_view').attr('aria-required',true);
jQuery('#jform_css_view').addClass('required');
jform_vvvvvzyvzr_required = false;
jform_vvvvvzyvzs_required = false;
}
}
else
{
jQuery('#jform_css_view').closest('.control-group').hide();
if (!jform_vvvvvzyvzr_required)
if (!jform_vvvvvzyvzs_required)
{
updateFieldRequired('css_view',1);
jQuery('#jform_css_view').removeAttr('required');
jQuery('#jform_css_view').removeAttr('aria-required');
jQuery('#jform_css_view').removeClass('required');
jform_vvvvvzyvzr_required = true;
jform_vvvvvzyvzs_required = true;
}
}
}
@@ -387,26 +387,26 @@ function vvvvvzz(add_css_views_vvvvvzz)
if (add_css_views_vvvvvzz == 1)
{
jQuery('#jform_css_views').closest('.control-group').show();
if (jform_vvvvvzzvzs_required)
if (jform_vvvvvzzvzt_required)
{
updateFieldRequired('css_views',0);
jQuery('#jform_css_views').prop('required','required');
jQuery('#jform_css_views').attr('aria-required',true);
jQuery('#jform_css_views').addClass('required');
jform_vvvvvzzvzs_required = false;
jform_vvvvvzzvzt_required = false;
}
}
else
{
jQuery('#jform_css_views').closest('.control-group').hide();
if (!jform_vvvvvzzvzs_required)
if (!jform_vvvvvzzvzt_required)
{
updateFieldRequired('css_views',1);
jQuery('#jform_css_views').removeAttr('required');
jQuery('#jform_css_views').removeAttr('aria-required');
jQuery('#jform_css_views').removeClass('required');
jform_vvvvvzzvzs_required = true;
jform_vvvvvzzvzt_required = true;
}
}
}
@@ -418,26 +418,26 @@ function vvvvwaa(add_javascript_view_footer_vvvvwaa)
if (add_javascript_view_footer_vvvvwaa == 1)
{
jQuery('#jform_javascript_view_footer').closest('.control-group').show();
if (jform_vvvvwaavzt_required)
if (jform_vvvvwaavzu_required)
{
updateFieldRequired('javascript_view_footer',0);
jQuery('#jform_javascript_view_footer').prop('required','required');
jQuery('#jform_javascript_view_footer').attr('aria-required',true);
jQuery('#jform_javascript_view_footer').addClass('required');
jform_vvvvwaavzt_required = false;
jform_vvvvwaavzu_required = false;
}
}
else
{
jQuery('#jform_javascript_view_footer').closest('.control-group').hide();
if (!jform_vvvvwaavzt_required)
if (!jform_vvvvwaavzu_required)
{
updateFieldRequired('javascript_view_footer',1);
jQuery('#jform_javascript_view_footer').removeAttr('required');
jQuery('#jform_javascript_view_footer').removeAttr('aria-required');
jQuery('#jform_javascript_view_footer').removeClass('required');
jform_vvvvwaavzt_required = true;
jform_vvvvwaavzu_required = true;
}
}
}
@@ -449,26 +449,26 @@ function vvvvwab(add_javascript_views_footer_vvvvwab)
if (add_javascript_views_footer_vvvvwab == 1)
{
jQuery('#jform_javascript_views_footer').closest('.control-group').show();
if (jform_vvvvwabvzu_required)
if (jform_vvvvwabvzv_required)
{
updateFieldRequired('javascript_views_footer',0);
jQuery('#jform_javascript_views_footer').prop('required','required');
jQuery('#jform_javascript_views_footer').attr('aria-required',true);
jQuery('#jform_javascript_views_footer').addClass('required');
jform_vvvvwabvzu_required = false;
jform_vvvvwabvzv_required = false;
}
}
else
{
jQuery('#jform_javascript_views_footer').closest('.control-group').hide();
if (!jform_vvvvwabvzu_required)
if (!jform_vvvvwabvzv_required)
{
updateFieldRequired('javascript_views_footer',1);
jQuery('#jform_javascript_views_footer').removeAttr('required');
jQuery('#jform_javascript_views_footer').removeAttr('aria-required');
jQuery('#jform_javascript_views_footer').removeClass('required');
jform_vvvvwabvzu_required = true;
jform_vvvvwabvzv_required = true;
}
}
}

60
admin/models/forms/help_document.js
View File

@@ -23,12 +23,12 @@
/-----------------------------------------------------------------------------------------------------------------------------*/
// Some Global Values
jform_vvvvwacvzx_required = false;
jform_vvvvwadvzy_required = false;
jform_vvvvwaevzz_required = false;
jform_vvvvwafwaa_required = false;
jform_vvvvwagwab_required = false;
jform_vvvvwahwac_required = false;
jform_vvvvwacvzy_required = false;
jform_vvvvwadvzz_required = false;
jform_vvvvwaewaa_required = false;
jform_vvvvwafwab_required = false;
jform_vvvvwagwac_required = false;
jform_vvvvwahwad_required = false;
// Initial Script
jQuery(document).ready(function()
@@ -59,26 +59,26 @@ function vvvvwac(location_vvvvwac)
if (location_vvvvwac == 1)
{
jQuery('#jform_admin_view').closest('.control-group').show();
if (jform_vvvvwacvzx_required)
if (jform_vvvvwacvzy_required)
{
updateFieldRequired('admin_view',0);
jQuery('#jform_admin_view').prop('required','required');
jQuery('#jform_admin_view').attr('aria-required',true);
jQuery('#jform_admin_view').addClass('required');
jform_vvvvwacvzx_required = false;
jform_vvvvwacvzy_required = false;
}
}
else
{
jQuery('#jform_admin_view').closest('.control-group').hide();
if (!jform_vvvvwacvzx_required)
if (!jform_vvvvwacvzy_required)
{
updateFieldRequired('admin_view',1);
jQuery('#jform_admin_view').removeAttr('required');
jQuery('#jform_admin_view').removeAttr('aria-required');
jQuery('#jform_admin_view').removeClass('required');
jform_vvvvwacvzx_required = true;
jform_vvvvwacvzy_required = true;
}
}
}
@@ -90,26 +90,26 @@ function vvvvwad(location_vvvvwad)
if (location_vvvvwad == 2)
{
jQuery('#jform_site_view').closest('.control-group').show();
if (jform_vvvvwadvzy_required)
if (jform_vvvvwadvzz_required)
{
updateFieldRequired('site_view',0);
jQuery('#jform_site_view').prop('required','required');
jQuery('#jform_site_view').attr('aria-required',true);
jQuery('#jform_site_view').addClass('required');
jform_vvvvwadvzy_required = false;
jform_vvvvwadvzz_required = false;
}
}
else
{
jQuery('#jform_site_view').closest('.control-group').hide();
if (!jform_vvvvwadvzy_required)
if (!jform_vvvvwadvzz_required)
{
updateFieldRequired('site_view',1);
jQuery('#jform_site_view').removeAttr('required');
jQuery('#jform_site_view').removeAttr('aria-required');
jQuery('#jform_site_view').removeClass('required');
jform_vvvvwadvzy_required = true;
jform_vvvvwadvzz_required = true;
}
}
}
@@ -134,26 +134,26 @@ function vvvvwae(type_vvvvwae)
if (type)
{
jQuery('#jform_url').closest('.control-group').show();
if (jform_vvvvwaevzz_required)
if (jform_vvvvwaewaa_required)
{
updateFieldRequired('url',0);
jQuery('#jform_url').prop('required','required');
jQuery('#jform_url').attr('aria-required',true);
jQuery('#jform_url').addClass('required');
jform_vvvvwaevzz_required = false;
jform_vvvvwaewaa_required = false;
}
}
else
{
jQuery('#jform_url').closest('.control-group').hide();
if (!jform_vvvvwaevzz_required)
if (!jform_vvvvwaewaa_required)
{
updateFieldRequired('url',1);
jQuery('#jform_url').removeAttr('required');
jQuery('#jform_url').removeAttr('aria-required');
jQuery('#jform_url').removeClass('required');
jform_vvvvwaevzz_required = true;
jform_vvvvwaewaa_required = true;
}
}
}
@@ -189,26 +189,26 @@ function vvvvwaf(type_vvvvwaf)
if (type)
{
jQuery('#jform_article').closest('.control-group').show();
if (jform_vvvvwafwaa_required)
if (jform_vvvvwafwab_required)
{
updateFieldRequired('article',0);
jQuery('#jform_article').prop('required','required');
jQuery('#jform_article').attr('aria-required',true);
jQuery('#jform_article').addClass('required');
jform_vvvvwafwaa_required = false;
jform_vvvvwafwab_required = false;
}
}
else
{
jQuery('#jform_article').closest('.control-group').hide();
if (!jform_vvvvwafwaa_required)
if (!jform_vvvvwafwab_required)
{
updateFieldRequired('article',1);
jQuery('#jform_article').removeAttr('required');
jQuery('#jform_article').removeAttr('aria-required');
jQuery('#jform_article').removeClass('required');
jform_vvvvwafwaa_required = true;
jform_vvvvwafwab_required = true;
}
}
}
@@ -244,26 +244,26 @@ function vvvvwag(type_vvvvwag)
if (type)
{
jQuery('#jform_content-lbl').closest('.control-group').show();
if (jform_vvvvwagwab_required)
if (jform_vvvvwagwac_required)
{
updateFieldRequired('content',0);
jQuery('#jform_content').prop('required','required');
jQuery('#jform_content').attr('aria-required',true);
jQuery('#jform_content').addClass('required');
jform_vvvvwagwab_required = false;
jform_vvvvwagwac_required = false;
}
}
else
{
jQuery('#jform_content-lbl').closest('.control-group').hide();
if (!jform_vvvvwagwab_required)
if (!jform_vvvvwagwac_required)
{
updateFieldRequired('content',1);
jQuery('#jform_content').removeAttr('required');
jQuery('#jform_content').removeAttr('aria-required');
jQuery('#jform_content').removeClass('required');
jform_vvvvwagwab_required = true;
jform_vvvvwagwac_required = true;
}
}
}
@@ -286,26 +286,26 @@ function vvvvwah(target_vvvvwah)
if (target_vvvvwah == 1)
{
jQuery('#jform_groups').closest('.control-group').show();
if (jform_vvvvwahwac_required)
if (jform_vvvvwahwad_required)
{
updateFieldRequired('groups',0);
jQuery('#jform_groups').prop('required','required');
jQuery('#jform_groups').attr('aria-required',true);
jQuery('#jform_groups').addClass('required');
jform_vvvvwahwac_required = false;
jform_vvvvwahwad_required = false;
}
}
else
{
jQuery('#jform_groups').closest('.control-group').hide();
if (!jform_vvvvwahwac_required)
if (!jform_vvvvwahwad_required)
{
updateFieldRequired('groups',1);
jQuery('#jform_groups').removeAttr('required');
jQuery('#jform_groups').removeAttr('aria-required');
jQuery('#jform_groups').removeClass('required');
jform_vvvvwahwac_required = true;
jform_vvvvwahwad_required = true;
}
}
}

4
admin/models/forms/layout.js
View File

@@ -9,8 +9,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 66 of this MVC
@build 3rd February, 2017
@version @update number 67 of this MVC
@build 11th February, 2017
@created 18th May, 2015
@package Component Builder
@subpackage layout.js

4
admin/models/import.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version 2.3.2
@build 11th February, 2017
@version 2.3.4
@build 13th February, 2017
@created 30th April, 2015
@package Component Builder
@subpackage import.php

4
admin/models/layout.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 66 of this MVC
@build 3rd February, 2017
@version @update number 67 of this MVC
@build 11th February, 2017
@created 18th May, 2015
@package Component Builder
@subpackage layout.php

4
admin/models/layouts.php
View File

@@ -10,8 +10,8 @@
|_|
/-------------------------------------------------------------------------------------------------------------------------------/
@version @update number 66 of this MVC
@build 3rd February, 2017
@version @update number 67 of this MVC
@build 11th February, 2017
@created 18th May, 2015
@package Component Builder
@subpackage layouts.php