Skip to content

Introduce jquery formvalidator for com_languages #5046

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 9 commits into from
Closed

Introduce jquery formvalidator for com_languages #5046

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
8d3f308
formvalidator & jquery
dgrammatiko Nov 8, 2014
7af4564
implode error
dgrammatiko Nov 8, 2014
4c70552
Quotes
dgrammatiko Nov 10, 2014
29c8df4
fix
dgrammatiko Nov 11, 2014
63160f4
small fix
dgrammatiko Nov 11, 2014
d6828dd
respect the new lines
dgrammatiko Nov 12, 2014
2a14685
JS CS
dgrammatiko Nov 21, 2014
8103e49
Merge branch 'staging' of https://github.com/joomla/joomla-cms into _…
dgrammatiko Nov 29, 2014
10b81c5
.ready()
dgrammatiko Nov 29, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions administrator/components/com_languages/views/language/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,19 @@

JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');

JHtml::_('behavior.formvalidation');
JHtml::_('behavior.formvalidator');
JHtml::_('formbehavior.chosen', 'select');
?>
<script type="text/javascript">
Joomla.submitbutton = function(task)
{
if (task == 'language.cancel' || document.formvalidator.isValid(document.id('language-form')))

JFactory::getDocument()->addScriptDeclaration('
Joomla.submitbutton = function(task)
{
Joomla.submitform(task, document.getElementById('language-form'));
if (task == "language.cancel" || document.formvalidator.isValid(document.getElementById("language-form")))
{
Joomla.submitform(task, document.getElementById("language-form"));
}
}
}
</script>
');
?>

<form action="<?php echo JRoute::_('index.php?option=com_languages&layout=edit&lang_id='.(int) $this->item->lang_id); ?>" method="post" name="adminForm" id="language-form" class="form-validate form-horizontal">

Expand Down
33 changes: 17 additions & 16 deletions administrator/components/com_languages/views/languages/tmpl/default.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,25 @@
}

$sortFields = $this->getSortFields();
?>
<script type="text/javascript">
Joomla.orderTable = function()
{
table = document.getElementById("sortTable");
direction = document.getElementById("directionTable");
order = table.options[table.selectedIndex].value;
if (order != '<?php echo $listOrder; ?>')
{
dirn = 'asc';
}
else

JFactory::getDocument()->addScriptDeclaration('
Joomla.orderTable = function()
{
dirn = direction.options[direction.selectedIndex].value;
table = document.getElementById("sortTable");
direction = document.getElementById("directionTable");
order = table.options[table.selectedIndex].value;
if (order != "' . $listOrder . '")
{
dirn = "asc";
}
else
{
dirn = direction.options[direction.selectedIndex].value;
}
Joomla.tableOrdering(order, dirn, "");
}
Joomla.tableOrdering(order, dirn, '');
}
</script>
');
?>

<form action="<?php echo JRoute::_('index.php?option=com_languages&view=languages'); ?>" method="post" name="adminForm" id="adminForm">
<?php if (!empty( $this->sidebar)) : ?>
Expand Down
36 changes: 18 additions & 18 deletions administrator/components/com_languages/views/override/tmpl/edit.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,35 +9,35 @@

defined('_JEXEC') or die;

JHtml::addIncludePath(JPATH_COMPONENT.'/helpers/html');
JHtml::addIncludePath(JPATH_COMPONENT . '/helpers/html');

JHtml::_('behavior.formvalidation');
JHtml::_('behavior.keepalive');
JHtml::_('formbehavior.chosen', 'select');
?>
<script type="text/javascript">
window.addEvent('domready', function()
{
document.id('jform_searchstring').addEvent('focus', function()

$expired = ($this->state->get("cache_expired") == 1 ) ? '1' : '';

JFactory::getDocument()->addScriptDeclaration('
document.getElementById("jform_searchstring").addEvent("focus", function() {
if (!Joomla.overrider.states.refreshed)
{
if (!Joomla.overrider.states.refreshed)
var expired = "' . $expired . '";
if (expired)
{
<?php if ($this->state->get('cache_expired')) : ?>
Joomla.overrider.refreshCache();
Joomla.overrider.states.refreshed = true;
<?php endif; ?>
}
this.removeClass('invalid');
});
}
this.removeClass("invalid");
});
Joomla.submitbutton = function(task)
{
if (task == 'override.cancel' || document.formvalidator.isValid(document.id('override-form')))
{
Joomla.submitform(task, document.getElementById('override-form'));
Joomla.submitbutton = function(task) {
if (task == "override.cancel" || document.formvalidator.isValid(document.getElementById("override-form")))
{
Joomla.submitform(task, document.getElementById("override-form"));
}
}
}
</script>
');
?>

<form action="<?php echo JRoute::_('index.php?option=com_languages&id='.$this->item->key); ?>" method="post" name="adminForm" id="override-form" class="form-validate form-horizontal">
<div class="row-fluid">
Expand Down
15 changes: 7 additions & 8 deletions administrator/components/com_menus/views/item/tmpl/edit_modules.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@

JHtml::_('behavior.core');

$script = array();
$script[] = " jQuery(document).ready(function() {";
$script[] = " jQuery('#showmods').on('click', function(e) {";
$script[] = " jQuery('.table tr.no').toggle();";
$script[] = " });";
$script[] = " })";
JFactory::getDocument()->addScriptDeclaration("
jQuery(document).ready(function() {
jQuery('#showmods').on('click', function(e) {
jQuery('.table tr.no').toggle();
});
})
");

// Add the script to the document head.
JFactory::getDocument()->addScriptDeclaration(implode("\n", $script));
?>

<div class="control-group">
Expand Down