0
/
leftypol_lainchan
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Fix ukko scroll to post is too high / incorrect bug because of post_controls being display block on ukko threads. Add ordering by sticky to ukko2 and ukko3 forms for overboards

This commit is contained in:
Benjamin Southall 2017-04-28 01:12:38 +09:00
parent acb8c5db6e
commit b3ffae8705
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/themes/ukko/theme.php
View File

@ -73,7 +73,7 @@
openBoard($post['board']); openBoard($post['board']);
$thread = new Thread($post, $mod ? '?/' : $config['root'], $mod); $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board'])); $posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `sticky` DESC, `id` DESC LIMIT :limit", $post['board']));
$posts->bindValue(':id', $post['id']); $posts->bindValue(':id', $post['id']);
$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT); $posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
$posts->execute() or error(db_error($posts)); $posts->execute() or error(db_error($posts));

2
templates/themes/ukko/ukko.js
View File

@ -84,7 +84,7 @@ $(document).ready(function() {
$(data).find('div[id*="thread_"]').each(function() { $(data).find('div[id*="thread_"]').each(function() {
var checkout = $(this).attr('id').replace('thread_', ''); var checkout = $(this).attr('id').replace('thread_', '');
if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) { if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) {
$('form[name="postcontrols"]').prepend($(this).css('display', 'block').attr("data-cached", "yes").attr('data-board', overflow[0].board)); $('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
} }
}); });

4
templates/themes/ukko2/theme.php
View File

@ -53,7 +53,7 @@
array_push($boardsforukko2,$_board); array_push($boardsforukko2,$_board);
} }
} }
$query = preg_replace('/UNION ALL $/', 'ORDER BY `bump` DESC', $query); $query = preg_replace('/UNION ALL $/', 'ORDER BY `sticky` DESC ,`bump` DESC', $query);
$query = query($query) or error(db_error()); $query = query($query) or error(db_error());
$count = 0; $count = 0;
@ -73,7 +73,7 @@
openBoard($post['board']); openBoard($post['board']);
$thread = new Thread($post, $mod ? '?/' : $config['root'], $mod); $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board'])); $posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `sticky` DESC, `id` DESC LIMIT :limit", $post['board']));
$posts->bindValue(':id', $post['id']); $posts->bindValue(':id', $post['id']);
$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT); $posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
$posts->execute() or error(db_error($posts)); $posts->execute() or error(db_error($posts));

2
templates/themes/ukko2/ukko.js
View File

@ -84,7 +84,7 @@ $(document).ready(function() {
$(data).find('div[id*="thread_"]').each(function() { $(data).find('div[id*="thread_"]').each(function() {
var checkout = $(this).attr('id').replace('thread_', ''); var checkout = $(this).attr('id').replace('thread_', '');
if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) { if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) {
$('form[name="postcontrols"]').prepend($(this).css('display', 'block').attr("data-cached", "yes").attr('data-board', overflow[0].board)); $('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
} }
}); });

4
templates/themes/ukko3/theme.php
View File

@ -53,7 +53,7 @@
array_push($boardsforukko3,$_board); array_push($boardsforukko3,$_board);
} }
} }
$query = preg_replace('/UNION ALL $/', 'ORDER BY `bump` DESC', $query); $query = preg_replace('/UNION ALL $/', 'ORDER BY `sticky` DESC ,`bump` DESC', $query);
$query = query($query) or error(db_error()); $query = query($query) or error(db_error());
$count = 0; $count = 0;
@ -73,7 +73,7 @@
openBoard($post['board']); openBoard($post['board']);
$thread = new Thread($post, $mod ? '?/' : $config['root'], $mod); $thread = new Thread($post, $mod ? '?/' : $config['root'], $mod);
$posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `id` DESC LIMIT :limit", $post['board'])); $posts = prepare(sprintf("SELECT * FROM ``posts_%s`` WHERE `thread` = :id ORDER BY `sticky` DESC, `id` DESC LIMIT :limit", $post['board']));
$posts->bindValue(':id', $post['id']); $posts->bindValue(':id', $post['id']);
$posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT); $posts->bindValue(':limit', ($post['sticky'] ? $config['threads_preview_sticky'] : $config['threads_preview']), PDO::PARAM_INT);
$posts->execute() or error(db_error($posts)); $posts->execute() or error(db_error($posts));

2
templates/themes/ukko3/ukko.js
View File

@ -84,7 +84,7 @@ $(document).ready(function() {
$(data).find('div[id*="thread_"]').each(function() { $(data).find('div[id*="thread_"]').each(function() {
var checkout = $(this).attr('id').replace('thread_', ''); var checkout = $(this).attr('id').replace('thread_', '');
if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) { if ($('div#thread_' + checkout + '[data-board="' + overflow[0].board + '"]').length == 0) {
$('form[name="postcontrols"]').prepend($(this).css('display', 'block').attr("data-cached", "yes").attr('data-board', overflow[0].board)); $('form[name="postcontrols"]').prepend($(this).css('display', 'none').attr("data-cached", "yes").attr('data-board', overflow[0].board));
} }
}); });