Merge pull request #314 from vomitcuddle/rm_dup_ext
Remove duplicate arrow key navigation extension
This commit is contained in:
Shish
commit
a212013d9d
@ -1,89 +0,0 @@
|
|||||||
<?php
|
|
||||||
/**
|
|
||||||
* Name: Arrow Key Navigation
|
|
||||||
* Author: Drudex Software <support@drudexsoftware.com>
|
|
||||||
* Link: http://www.drudexsoftware.com/
|
|
||||||
* License: GPLv2
|
|
||||||
* Description: Allows viewers no navigate between images using the left & right arrow keys.
|
|
||||||
* Documentation:
|
|
||||||
* Simply enable this extention in the extention manager to enable arrow key navigation.
|
|
||||||
*/
|
|
||||||
class ArrowkeyNavigation extends Extension {
|
|
||||||
# Adds functionality for post/view on images
|
|
||||||
public function onDisplayingImage(DisplayingImageEvent $event) {
|
|
||||||
$prev_url = make_http(make_link("post/prev/".$event->image->id));
|
|
||||||
$next_url = make_http(make_link("post/next/".$event->image->id));
|
|
||||||
$this->add_arrowkeys_code($prev_url, $next_url);
|
|
||||||
}
|
|
||||||
|
|
||||||
# Adds functionality for post/list
|
|
||||||
public function onPageRequest(PageRequestEvent $event) {
|
|
||||||
if($event->page_matches("post/list")) {
|
|
||||||
$pageinfo = $this->get_list_pageinfo($event);
|
|
||||||
$prev_url = make_http(make_link("post/list/".$pageinfo["prev"]));
|
|
||||||
$next_url = make_http(make_link("post/list/".$pageinfo["next"]));
|
|
||||||
$this->add_arrowkeys_code($prev_url, $next_url);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
# adds the javascript to the page with the given urls
|
|
||||||
private function add_arrowkeys_code($prev_url, $next_url) {
|
|
||||||
global $page;
|
|
||||||
|
|
||||||
$page->add_html_header("<script type=\"text/javascript\">
|
|
||||||
document.onkeyup=checkKeycode;
|
|
||||||
function checkKeycode(e)
|
|
||||||
{
|
|
||||||
var keycode;
|
|
||||||
if(window.event) keycode=window.event.keyCode;
|
|
||||||
else if(e) keycode=e.which;
|
|
||||||
|
|
||||||
if (e.srcElement.tagName != \"INPUT\")
|
|
||||||
{
|
|
||||||
if(keycode==\"37\") window.location.href='$prev_url';
|
|
||||||
else if(keycode==\"39\") window.location.href='$next_url';
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>");
|
|
||||||
}
|
|
||||||
|
|
||||||
# returns info about the current page number
|
|
||||||
private function get_list_pageinfo($event) {
|
|
||||||
global $config, $database;
|
|
||||||
|
|
||||||
// get the amount of images per page
|
|
||||||
$images_per_page = $config->get_int('index_images');
|
|
||||||
|
|
||||||
// if there are no tags, use default
|
|
||||||
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);
|
|
||||||
}
|
|
||||||
|
|
||||||
// creates previous & next values
|
|
||||||
// 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;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
?>
|
|
||||||
@ -8,28 +8,22 @@
|
|||||||
* Documentation:
|
* Documentation:
|
||||||
* 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 arrowkey_navigation extends Extension {
|
class ArrowkeyNavigation extends Extension {
|
||||||
|
# Adds functionality for post/view on images
|
||||||
|
public function onDisplayingImage(DisplayingImageEvent $event) {
|
||||||
|
$prev_url = make_http(make_link("post/prev/".$event->image->id));
|
||||||
|
$next_url = make_http(make_link("post/next/".$event->image->id));
|
||||||
|
$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/view")) {
|
if($event->page_matches("post/list")) {
|
||||||
$pageinfo = $this->get_view_pageinfo($event);
|
|
||||||
$prev_url = make_http(make_link("post/prev/".$pageinfo));
|
|
||||||
$next_url = make_http(make_link("post/next/".$pageinfo));
|
|
||||||
$this->add_arrowkeys_code($prev_url, $next_url);
|
|
||||||
}
|
|
||||||
|
|
||||||
else 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);
|
||||||
}
|
}
|
||||||
|
|
||||||
// for random_list extension
|
|
||||||
else if ($event->page_matches("random")) {
|
|
||||||
$randomurl = make_http(make_link("random"));
|
|
||||||
$this->add_arrowkeys_code($randomurl, $randomurl);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# adds the javascript to the page with the given urls
|
# adds the javascript to the page with the given urls
|
||||||
@ -46,8 +40,8 @@ class arrowkey_navigation extends Extension {
|
|||||||
|
|
||||||
if (e.srcElement.tagName != \"INPUT\")
|
if (e.srcElement.tagName != \"INPUT\")
|
||||||
{
|
{
|
||||||
if(keycode==\"37\") window.location.href='$prev_url' + window.location.hash;
|
if(keycode==\"37\") window.location.href='$prev_url';
|
||||||
else if(keycode==\"39\") window.location.href='$next_url' + window.location.hash;
|
else if(keycode==\"39\") window.location.href='$next_url';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>");
|
</script>");
|
||||||
@ -60,16 +54,8 @@ class arrowkey_navigation extends Extension {
|
|||||||
// get the amount of images per page
|
// get the amount of images per page
|
||||||
$images_per_page = $config->get_int('index_images');
|
$images_per_page = $config->get_int('index_images');
|
||||||
|
|
||||||
// this occurs when viewing post/list without page number
|
|
||||||
if ($event->get_arg(0) == null) {// no page listed
|
|
||||||
$prefix = "";
|
|
||||||
$page_number = 1;
|
|
||||||
$total_pages = ceil($database->get_one(
|
|
||||||
"SELECT COUNT(*) FROM images") / $images_per_page);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if there are no tags, use default
|
// if there are no tags, use default
|
||||||
else if ($event->get_arg(1) == null){
|
if ($event->get_arg(1) == null){
|
||||||
$prefix = "";
|
$prefix = "";
|
||||||
$page_number = (int)$event->get_arg(0);
|
$page_number = (int)$event->get_arg(0);
|
||||||
$total_pages = ceil($database->get_one(
|
$total_pages = ceil($database->get_one(
|
||||||
@ -93,28 +79,11 @@ class arrowkey_navigation extends Extension {
|
|||||||
|
|
||||||
// Create return array
|
// Create return array
|
||||||
$pageinfo = array(
|
$pageinfo = array(
|
||||||
"prev" => $prefix.$prev.$after,
|
"prev" => $prefix.$prev,
|
||||||
"next" => $prefix.$next.$after,
|
"next" => $prefix.$next,
|
||||||
);
|
);
|
||||||
|
|
||||||
return $pageinfo;
|
return $pageinfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
# returns url ext with any tags
|
|
||||||
private function get_view_pageinfo($event) {
|
|
||||||
// if there are no tags, use default
|
|
||||||
if ($event->get_arg(1) == null){
|
|
||||||
$prefix = "";
|
|
||||||
$image_id = (int)$event->get_arg(0);
|
|
||||||
}
|
|
||||||
|
|
||||||
else { // if there are tags, use pages with tags
|
|
||||||
$prefix = $event->get_arg(0)."/";
|
|
||||||
$image_id = (int)$event->get_arg(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// returns result
|
|
||||||
return $prefix.$image_id;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user