diff options
| author | PayBas <contact@paybas.com> | 2014-05-30 01:40:43 +0200 |
|---|---|---|
| committer | PayBas <contact@paybas.com> | 2014-06-05 09:59:34 +0200 |
| commit | cd90b39a833604b982491d0c92979cf189c1f426 (patch) | |
| tree | c938eb98dc109ff7eaec305bcb3d2c7427a8c006 /phpBB | |
| parent | 140ecf1c98175ce6984968d10c35ce80fe927526 (diff) | |
| download | forums-cd90b39a833604b982491d0c92979cf189c1f426.tar forums-cd90b39a833604b982491d0c92979cf189c1f426.tar.gz forums-cd90b39a833604b982491d0c92979cf189c1f426.tar.bz2 forums-cd90b39a833604b982491d0c92979cf189c1f426.tar.xz forums-cd90b39a833604b982491d0c92979cf189c1f426.zip | |
[ticket/12613] Removed jump-to placeholder and added .focus() check
PHPBB3-12613
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/styles/prosilver/template/forum_fn.js | 9 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/pagination.html | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js index 5d2382c4dd..ebdb843a38 100644 --- a/phpBB/styles/prosilver/template/forum_fn.js +++ b/phpBB/styles/prosilver/template/forum_fn.js @@ -361,9 +361,12 @@ function parse_document(container) }); container.find('.pagination-trigger').click(function() { - $input = $(this).parent().find("input[name='page-number']"); - - setTimeout(function() { $input.focus(); },100); + $container = $(this).parent(); + + if (!$container.hasClass('dropdown-visible')) { + $input = $container.find("input[name='page-number']"); + setTimeout(function() { $input.focus(); },100); + } }); /** diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html index 8b8631ce26..26bf3d88ab 100644 --- a/phpBB/styles/prosilver/template/pagination.html +++ b/phpBB/styles/prosilver/template/pagination.html @@ -9,7 +9,7 @@ <li> <form class="page-jump-form" method="get"> <fieldset> - <input type="text" name="page-number" maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" placeholder="{CURRENT_PAGE}" /> + <input type="text" name="page-number" maxlength="6" title="{L_SEARCH_KEYWORDS}" class="inputbox tiny" value="" /> <input class="button2" value="{L_GO}" type="submit" /> <input type="hidden" value="{PER_PAGE}" name="per-page"> <input type="hidden" value="{START_NAME}" name="start-name"> |