use jQuery instead of JS + change spacing to tabs

this should fix IE/browser problems (see: #349)
This commit is contained in:
Daku 2014-02-19 06:23:08 +00:00
parent 5df6c09da6
commit fe6b83412f

View File

@ -9,81 +9,74 @@
* Simply enable this extention in the extention manager to enable arrow key navigation. * Simply enable this extention in the extention manager to enable arrow key navigation.
*/ */
class ArrowkeyNavigation extends Extension { class ArrowkeyNavigation extends Extension {
# Adds functionality for post/view on images # Adds functionality for post/view on images
public function onDisplayingImage(DisplayingImageEvent $event) { public function onDisplayingImage(DisplayingImageEvent $event) {
$prev_url = make_http(make_link("post/prev/".$event->image->id)); $prev_url = make_http(make_link("post/prev/".$event->image->id));
$next_url = make_http(make_link("post/next/".$event->image->id)); $next_url = make_http(make_link("post/next/".$event->image->id));
$this->add_arrowkeys_code($prev_url, $next_url); $this->add_arrowkeys_code($prev_url, $next_url);
} }
# Adds functionality for post/list # Adds functionality for post/list
public function onPageRequest(PageRequestEvent $event) { public function onPageRequest(PageRequestEvent $event) {
if($event->page_matches("post/list")) { if($event->page_matches("post/list")) {
$pageinfo = $this->get_list_pageinfo($event); $pageinfo = $this->get_list_pageinfo($event);
$prev_url = make_http(make_link("post/list/".$pageinfo["prev"])); $prev_url = make_http(make_link("post/list/".$pageinfo["prev"]));
$next_url = make_http(make_link("post/list/".$pageinfo["next"])); $next_url = make_http(make_link("post/list/".$pageinfo["next"]));
$this->add_arrowkeys_code($prev_url, $next_url); $this->add_arrowkeys_code($prev_url, $next_url);
} }
} }
# adds the javascript to the page with the given urls # adds the javascript to the page with the given urls
private function add_arrowkeys_code($prev_url, $next_url) { private function add_arrowkeys_code($prev_url, $next_url) {
global $page; global $page;
$page->add_html_header("<script type=\"text/javascript\"> $page->add_html_header("<script type=\"text/javascript\">
document.onkeyup=checkKeycode; (function($){
function checkKeycode(e) $(document).keyup(function(e) {
{ if($(e.target).is('input', 'textarea')){ return; }
var keycode; if (e.keyCode == 37) { window.location.href = '{$prev_url}'; }
if(window.event) keycode=window.event.keyCode; else if (e.keyCode == 39) { window.location.href = '{$next_url}'; }
else if(e) keycode=e.which; });
})(jQuery);
</script>", 60);
}
if (e.srcElement.tagName != \"INPUT\") # returns info about the current page number
{ private function get_list_pageinfo($event) {
if(keycode==\"37\") window.location.href='$prev_url'; global $config, $database;
else if(keycode==\"39\") window.location.href='$next_url';
}
}
</script>");
}
# returns info about the current page number // get the amount of images per page
private function get_list_pageinfo($event) { $images_per_page = $config->get_int('index_images');
global $config, $database;
// get the amount of images per page // if there are no tags, use default
$images_per_page = $config->get_int('index_images'); if ($event->get_arg(1) == null){
$prefix = "";
$page_number = (int)$event->get_arg(0);
$total_pages = ceil($database->get_one(
"SELECT COUNT(*) FROM images") / $images_per_page);
}
else { // if there are tags, use pages with tags
$prefix = $event->get_arg(0)."/";
$page_number = (int)$event->get_arg(1);
$total_pages = ceil($database->get_one(
"SELECT count FROM tags WHERE tag=:tag",
array("tag"=>$event->get_arg(0))) / $images_per_page);
}
// if there are no tags, use default // creates previous & next values
if ($event->get_arg(1) == null){ // When previous first page, go to last page
$prefix = ""; if ($page_number <= 1) $prev = $total_pages;
$page_number = (int)$event->get_arg(0); else $prev = $page_number-1;
$total_pages = ceil($database->get_one( if ($page_number >= $total_pages) $next = 1;
"SELECT COUNT(*) FROM images") / $images_per_page); else $next = $page_number+1;
}
else { // if there are tags, use pages with tags // Create return array
$prefix = $event->get_arg(0)."/"; $pageinfo = array(
$page_number = (int)$event->get_arg(1); "prev" => $prefix.$prev,
$total_pages = ceil($database->get_one( "next" => $prefix.$next,
"SELECT count FROM tags WHERE tag=:tag", );
array("tag"=>$event->get_arg(0))) / $images_per_page);
}
// creates previous & next values return $pageinfo;
// When previous first page, go to last page }
if ($page_number <= 1) $prev = $total_pages;
else $prev = $page_number-1;
if ($page_number >= $total_pages) $next = 1;
else $next = $page_number+1;
// Create return array
$pageinfo = array(
"prev" => $prefix.$prev,
"next" => $prefix.$next,
);
return $pageinfo;
}
} }
?> ?>