makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12539] Change let to var in jQuery

Browse source 
PHPBB3-12539
This commit is contained in:
mrgoldy 2019-10-22 22:19:07 +02:00
parent ccc21a8c94
commit fe7118aea0
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
phpBB/assets/javascript/core.js
View file

@ -563,7 +563,6 @@ phpbb.search.setValue = function($input, value, multiline) {
phpbb.search.setValueOnClick = function($input, value, $row, $container) { phpbb.search.setValueOnClick = function($input, value, $row, $container) {
$row.click(function() { $row.click(function() {
phpbb.search.setValue($input, value.result, $input.attr('data-multiline')); phpbb.search.setValue($input, value.result, $input.attr('data-multiline'));
phpbb.search.closeResults($input, $container); phpbb.search.closeResults($input, $container);
}); });
}; };
@ -578,7 +577,7 @@ phpbb.search.setValueOnClick = function($input, value, $row, $container) {
* @param {object} event Onkeyup event object. * @param {object} event Onkeyup event object.
* @param {function} sendRequest Function to execute AJAX request. * @param {function} sendRequest Function to execute AJAX request.
* *
* @returns {bool} Returns false. * @returns {boolean} Returns false.
*/ */
phpbb.search.filter = function(data, event, sendRequest) { phpbb.search.filter = function(data, event, sendRequest) {
var $this = $(this), var $this = $(this),
@ -714,7 +713,7 @@ phpbb.search.showResults = function(results, $input, $container, callback) {
/** /**
* Clear search results. * Clear search results.
* *
* @param {jQuery} $container Search results container. * @param {jQuery} $container Search results container.
*/ */
phpbb.search.clearResults = function($container) { phpbb.search.clearResults = function($container) {
$container.children(':not(.search-result-tpl)').remove(); $container.children(':not(.search-result-tpl)').remove();
@ -723,33 +722,33 @@ phpbb.search.clearResults = function($container) {
/** /**
* Close search results. * Close search results.
* *
* @param {jQuery} $input Search input|textarea. * @param {jQuery} $input Search input|textarea.
* @param {jQuery} $container Search results container. * @param {jQuery} $container Search results container.
*/ */
phpbb.search.closeResults = function($input, $container) { phpbb.search.closeResults = function($input, $container) {
$input.off('.searchNavigation'); $input.off('.phpbb.search');
$container.hide(); $container.hide();
}; };
/** /**
* Navigate search results. * Navigate search results.
* *
* @param {jQuery} $input Search input|textarea. * @param {jQuery} $input Search input|textarea.
* @param {jQuery} $container Search results container. * @param {jQuery} $container Search results container.
* @param {jQuery} $resultContainer Search results list container. * @param {jQuery} $resultContainer Search results list container.
*/ */
phpbb.search.navigateResults = function($input, $container, $resultContainer) { phpbb.search.navigateResults = function($input, $container, $resultContainer) {
// Add a namespace to the event (.searchNavigation), // Add a namespace to the event (.phpbb.search),
// so it can be unbound specifically later on. // so it can be unbound specifically later on.
$input.on('keydown.searchNavigation', function(event) { $input.on('keydown.phpbb.search', function(event) {
let key = event.keyCode || event.which, var key = event.keyCode || event.which,
$active = $resultContainer.children('.active'); $active = $resultContainer.children('.active');
switch (key) { switch (key) {
// Set the value for the selected result // Set the value for the selected result
case keymap.ENTER: case keymap.ENTER:
if ($active.length) { if ($active.length) {
let value = $active.find('.search-result > span').text(); var value = $active.find('.search-result > span').text();
phpbb.search.setValue($input, value, $input.attr('data-multiline')); phpbb.search.setValue($input, value, $input.attr('data-multiline'));
} }
@ -768,24 +767,25 @@ phpbb.search.navigateResults = function($input, $container, $resultContainer) {
// Navigate the results // Navigate the results
case keymap.ARROW_DOWN: case keymap.ARROW_DOWN:
case keymap.ARROW_UP: case keymap.ARROW_UP:
let up = key === keymap.ARROW_UP; var up = key === keymap.ARROW_UP,
$children = $resultContainer.children();
if (!$active.length) { if (!$active.length) {
if (up) { if (up) {
$resultContainer.children().last().addClass('active'); $children.last().addClass('active');
} else { } else {
$resultContainer.children().first().addClass('active'); $children.first().addClass('active');
} }
} else { } else if ($children.length > 1) {
if (up) { if (up) {
if ($active.is(':first-child')) { if ($active.is(':first-child')) {
$resultContainer.children().last().addClass('active'); $children.last().addClass('active');
} else { } else {
$active.prev().addClass('active'); $active.prev().addClass('active');
} }
} else { } else {
if ($active.is(':last-child')) { if ($active.is(':last-child')) {
$resultContainer.children().first().addClass('active'); $children.first().addClass('active');
} else { } else {
$active.next().addClass('active'); $active.next().addClass('active');
} }