aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/styles/prosilver/template
diff options
context:
space:
mode:
authorPayBas <contact@paybas.com>2014-06-01 19:08:07 +0200
committerPayBas <contact@paybas.com>2014-06-05 09:59:36 +0200
commit27c678125a0a9e74ef644fadaf0ff7ca448bca90 (patch)
treed3875b14244e7eef4af3dc22b6f1921ae68e955c /phpBB/styles/prosilver/template
parentc47b546bf08775d215da4bd07e7a93cbc68b322f (diff)
downloadforums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar
forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.gz
forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.bz2
forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.tar.xz
forums-27c678125a0a9e74ef644fadaf0ff7ca448bca90.zip
[ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
Also removed outdated CSS PHPBB3-12613
Diffstat (limited to 'phpBB/styles/prosilver/template')
-rw-r--r--phpBB/styles/prosilver/template/forum_fn.js13
-rw-r--r--phpBB/styles/prosilver/template/pagination.html2
2 files changed, 8 insertions, 7 deletions
diff --git a/phpBB/styles/prosilver/template/forum_fn.js b/phpBB/styles/prosilver/template/forum_fn.js
index a4d4c7527c..7041c6021c 100644
--- a/phpBB/styles/prosilver/template/forum_fn.js
+++ b/phpBB/styles/prosilver/template/forum_fn.js
@@ -367,13 +367,14 @@ function parse_document(container)
}
});
- container.find('.pagination-trigger').click(function() {
+ container.find('.pagination .dropdown-trigger').click(function() {
$dropdown_container = $(this).parent();
-
- if (!$dropdown_container.hasClass('dropdown-visible')) {
- $input = $dropdown_container.find("input.inputbox");
- setTimeout(function() { $input.focus(); },100);
- }
+ // Wait a little bit to make sure the dropdown has activated
+ setTimeout(function() {
+ if ($dropdown_container.hasClass('dropdown-visible')) {
+ $dropdown_container.find("input.inputbox").focus();
+ }
+ },100);
});
/**
diff --git a/phpBB/styles/prosilver/template/pagination.html b/phpBB/styles/prosilver/template/pagination.html
index 080a946ffd..8f137eb8ef 100644
--- a/phpBB/styles/prosilver/template/pagination.html
+++ b/phpBB/styles/prosilver/template/pagination.html
@@ -1,7 +1,7 @@
<ul>
<!-- IF BASE_URL -->
<li class="dropdown-container dropdown-button-control dropdown-page-jump page-jump">
- <a href="#" class="pagination-trigger dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a>
+ <a href="#" class="dropdown-trigger" title="{L_JUMP_TO_PAGE_CLICK}">{PAGE_NUMBER}</a>
<div class="dropdown hidden">
<div class="pointer"><div class="pointer-inner"></div></div>
<ul class="dropdown-contents">