From 75a98cf6e7e3dd38f07878bccfe50e72c05756e7 Mon Sep 17 00:00:00 2001 From: kilo Date: Thu, 3 Aug 2017 22:09:06 +0200 Subject: [PATCH] Show hours & minutes (instead of days & hours) when hovering last scraped date (#1335) * Update main.js * Update view.jet.html * Update main.js --- public/js/main.js | 9 ++++++++- templates/site/torrents/view.jet.html | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/public/js/main.js b/public/js/main.js index 50ceed62..0acbefa1 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -55,7 +55,13 @@ function parseAllDates() { for (var i in list) { var e = list[i] var dateDifference = dateDiff(new Date(e.innerText), new Date()) - e.title = dateDifference.d + " days " + dateDifference.h + " hours ago" + + if(e.className.includes("scrape-date")) + e.title = ((dateDifference.d * 24) + dateDifference.h) + " hours " + dateDifference.m + " minutes ago" + + //e.title = T.r("torrent_age2", dateDifference.h, dateDifference.m) + else + e.title = dateDifference.d + " days " + dateDifference.h + " hours ago" + //e.title = T.r("torrent_age", dateDifference.d, dateDifference.h) e.innerText = new Date(e.innerText).toLocaleString(lang) } @@ -64,6 +70,7 @@ function dateDiff( str1, str2 ) { var diff = Date.parse( str2 ) - Date.parse( str1 ); return isNaN( diff ) ? NaN : { diff : diff, + m : Math.floor( diff / 60000 % 60 ), h : -Math.floor( diff / 3600000 % 24 ), d : -Math.floor( diff / 86400000 ) }; diff --git a/templates/site/torrents/view.jet.html b/templates/site/torrents/view.jet.html index f55c81af..78c99e36 100644 --- a/templates/site/torrents/view.jet.html +++ b/templates/site/torrents/view.jet.html @@ -48,7 +48,7 @@ {{ T("size")}}: {{ fileSize(Torrent.Filesize, T) }} {{ T("last_scraped")}} - {{formatDateRFC(Torrent.LastScrape)}}{{else}}">{{ T("unknown")}}{{end}} + {{formatDateRFC(Torrent.LastScrape)}}{{else}}">{{ T("unknown")}}{{end}} {{ if len(Torrent.Languages) > 0 && Torrent.Languages[0] != "" }}