Skip to content
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

Jump to bottom

[4.0] Replace js alerts for joomla alerts #15315

Merged
merged 13 commits into from Apr 15, 2017
Merged

[4.0] Replace js alerts for joomla alerts #15315

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
2df5ec7
replace js alerts for joomla alerts
NunoLopesPT Apr 14, 2017
de953ff
Changed JText to see if pass Travis
NunoLopesPT Apr 14, 2017
56c0dd0
Reverted changes
NunoLopesPT Apr 15, 2017
6ae685f
fixed travis error
NunoLopesPT Apr 15, 2017
368f9f1
Merge branch 'replaceJSalerts' of https://github.com/NunoLopes96/joom…
NunoLopesPT Apr 15, 2017
ef1d631
Travis error
NunoLopesPT Apr 15, 2017
c90bfed
\n and \t are not working in , trying different ways
NunoLopesPT Apr 15, 2017
746f8d1
Codestyle
NunoLopesPT Apr 15, 2017
64b6b80
Removed JText::_, Added JText::script, no need now to use <h4>Warning…
NunoLopesPT Apr 15, 2017
e6af6dc
replaced JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST
NunoLopesPT Apr 15, 2017
3c2d421
Travis error
NunoLopesPT Apr 15, 2017
76740e0
Replace line in lang
NunoLopesPT Apr 15, 2017
5854293
Remove unneeded variable
wilsonge Apr 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions libraries/cms/toolbar/button/standard.php
View file
Open in desktop
Expand Up @@ -115,13 +115,14 @@ public function fetchId($type = 'Standard', $name = '', $text = '', $task = '',
*/
protected function _getCommand($name, $task, $list)
{
JText::script('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');
$alert = JText::_('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST');

$cmd = "Joomla.submitbutton('" . $task . "');";

if ($list)
{
$alert = "alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST'));";
$messages = "{'warning': ['" . $alert . "', '<h4>" . JText::_('WARNING') . "</h4>']}";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you sure it will not fail when the translation contain the quote?
and why do not use Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

please use JText::script and do not do this trap, with hard mix of PHP and JavaScript

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Fedik Thank you for the tip, while using your advice I found that no '<h4>" . JText::_('WARNING') . "</h4>' was required if I had a JText::script('WARNING');

$alert = "Joomla.renderMessages(" . $messages . ")";
$cmd = "if (document.adminForm.boxchecked.value == 0) { " . $alert . " } else { " . $cmd . " }";
}

Expand Down
8 changes: 5 additions & 3 deletions tests/unit/suites/libraries/cms/toolbar/JToolbarButtonTest.php
View file
Open in desktop
Expand Up @@ -123,9 +123,11 @@ public function testRender()
{
$type = array('Standard', 'test');

$expected = "\n<button onclick=\"if (document.adminForm.boxchecked.value == 0) { alert(Joomla.JText._('JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST')); } else { Joomla.submitbutton(''); }\" class=\"btn btn-sm btn-outline-primary\">\n"
. "\t<span class=\"icon-test\"></span>\n"
. "\t</button>\n";
$alert = JText::_('WARNING');

$expected = "\n<button onclick=\"if (document.adminForm.boxchecked.value == 0) { Joomla.renderMessages({'warning': ['JLIB_HTML_PLEASE_MAKE_A_SELECTION_FROM_THE_LIST', '<h4>"
. $alert
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here

. "</h4>']}) } else { Joomla.submitbutton(''); }\" class=\"btn btn-sm btn-outline-primary\">\n\t<span class=\"icon-test\"></span>\n\t</button>\n";

$this->assertEquals(
$expected,
Expand Down