From 8bd65bfe066ec671553c38e88c48713a73b85192 Mon Sep 17 00:00:00 2001 From: Git Date: Sun, 15 Nov 2015 08:00:28 +0000 Subject: [PATCH] Empty commit --- docs/CHANGES.txt | 3 ++ sections/ajax/forum/forum.php | 4 ++- sections/artist/artist.php | 4 +-- sections/bookmarks/torrents.php | 4 +-- sections/collages/torrent_collage.php | 4 +-- sections/top10/votes.php | 4 +-- sections/torrents/browse.php | 4 +-- sections/torrents/details.php | 2 +- sections/torrents/functions.php | 2 +- sections/userhistory/subscribed_collages.php | 4 +-- static/functions/browse.js | 32 ++++++++++++++------ 11 files changed, 43 insertions(+), 24 deletions(-) diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt index 81ad3429..a4d93a5e 100644 --- a/docs/CHANGES.txt +++ b/docs/CHANGES.txt @@ -1,5 +1,8 @@ CHANGE LOG +2015-11-14 by techietrash +Fix ctrl+click group collapsing/expanding on OSX + 2015-11-06 by newman Add proper title to torrent stats page. Update token history to display deleted torrents. diff --git a/sections/ajax/forum/forum.php b/sections/ajax/forum/forum.php index 8e185972..a465d8c6 100644 --- a/sections/ajax/forum/forum.php +++ b/sections/ajax/forum/forum.php @@ -20,7 +20,9 @@ } if (isset($_GET['pp'])) { - $PerPage = $_GET['pp']; + + $PerPage = $_GET['pp']; + } elseif (isset($LoggedUser['PostsPerPage'])) { $PerPage = $LoggedUser['PostsPerPage']; } else { diff --git a/sections/artist/artist.php b/sections/artist/artist.php index f25eb18e..d6244609 100644 --- a/sections/artist/artist.php +++ b/sections/artist/artist.php @@ -387,7 +387,7 @@ function compare($X, $Y) {
- +
@@ -442,7 +442,7 @@ function compare($X, $Y) { ?> - − + − " id="group_">
- +
@@ -133,7 +133,7 @@ function compare($X, $Y) { $EditionID++; ?> - − + − " id="group_">
- +
@@ -157,7 +157,7 @@ function compare($X, $Y) { $EditionID++; ?> - − + − " id="group_">
- +
@@ -279,7 +279,7 @@ $EditionID++; ?> - − + −
- +
@@ -630,7 +630,7 @@ function header_link($SortKey, $DefaultWay = 'desc') { ?> - − + − - − + − - − + − " id="group_">
- +
@@ -174,7 +174,7 @@ $EditionID++; ?> - − + − (Mac) or [Ctrl] (PC) while clicking to collapse all groups '+section + : 'Expand this group. Hold [Command] (Mac) or [Ctrl] (PC) while clicking to expand all groups '+section; $('a.show_torrents_link', row).updateTooltip(tooltip); $('a.show_torrents_link', row).raw().parentNode.className = (showing) ? 'hide_torrents' : 'show_torrents'; } else { @@ -160,19 +165,28 @@ function toggle_edition(groupid, editionid, lnk, event) { } //var showing = has_class(nextElementSibling(clickedRow), 'hidden'); var showing = $(clickedRow).nextElementSibling().has_class('hidden'); - var allEditions = event.ctrlKey; + var allEditions = (event.ctrlKey || event.metaKey); // detect ctrl and cmd + // for dealing with Mac OS X + // http://stackoverflow.com/a/3922353 + var allEditionsMac = ( + event.keyCode == 91 // WebKit (left apple) + || event.keyCode == 93 // WebKit (right apple) + || event.keyCode == 224 // Firefox + || event.keyCode == 17 // Opera + ) ? true : null; + var group_rows = $('tr.groupid_' + groupid); for (var i = 0; i < group_rows.results(); i++) { var row = $(group_rows.raw(i)); if (row.has_class('edition') && (allEditions || row.raw(0) == clickedRow)) { var tooltip = showing - ? 'Collapse this edition. Hold "Ctrl" while clicking to collapse all editions in this torrent group.' - : 'Expand this edition. Hold "Ctrl" while clicking to expand all editions in this torrent group.'; + ? 'Collapse this edition. Hold [Command] (Mac) or [Ctrl] (PC) while clicking to collapse all editions in this torrent group.' + : 'Expand this edition. Hold [Command] (Mac) or [Ctrl] (PC) while clicking to expand all editions in this torrent group.'; $('a', row).raw().innerHTML = (showing) ? '−' : '+'; $('a', row).updateTooltip(tooltip); continue; } - if (allEditions || row.has_class('edition_' + editionid)) { + if (allEditions || allEditionsMac || row.has_class('edition_' + editionid)) { if (showing && !row.has_class('torrentdetails')) { row.gshow(); } else { @@ -282,4 +296,4 @@ function ToggleEditionRows() { $('#edition_title').gtoggle(); $('#edition_label').gtoggle(); $('#edition_catalogue').gtoggle(); -} +} \ No newline at end of file