diff --git a/script.js b/script.js index b87dded..fa94ffb 100644 --- a/script.js +++ b/script.js @@ -95,8 +95,10 @@ const fetchPosts = async function(serverUrl, hashtag) { // updateTimesOnPage updates the time information displayed for each post const updateTimesOnPage = function() { - $('.card-text a').each(function() { - const date = new Date($(this).attr('data-time')); + $('.card-text a.time').each(function() { + const timeValue = $(this).attr('data-time'); + if (timeValue === '') return; + const date = new Date(timeValue); const newTimeAgo = timeAgo(secondsAgo(date)); $(this).text(newTimeAgo); }); @@ -118,7 +120,7 @@ const displayPost = function(post) { ${post.media_attachments[0] ? `` : ''}
${DOMPurify.sanitize(post.content)}
${post.spoiler_text ? `${DOMPurify.sanitize(post.spoiler_text)}
` : ''} -${timeAgo(secondsAgo(new Date(post.created_at)))}
+${timeAgo(secondsAgo(new Date(post.created_at)))}
`; @@ -165,16 +167,25 @@ const updateCarousel = function(slides, posts) { var newHTML = ` ` newHTML += `${DOMPurify.sanitize(post.content)}
${DOMPurify.sanitize(post.content)}
- ${timeAgo(secondsAgo(new Date(post.created_at)))} + ${timeAgo(secondsAgo(new Date(post.created_at)))} ${post.favourites_count ? `, ${post.favourites_count} mal favorisiert` : '' } ${post.replies_count ? `, ${post.replies_count} mal kommentiert` : '' } ${post.reblogs_count ? `, ${post.reblogs_count} mal geteilt` : '' } @@ -218,6 +229,11 @@ const showCarousel = function() { $('#myCarousel').carousel("cycle"); } +const strip = function(html) { + let doc = new DOMParser().parseFromString(html, 'text/html'); + return doc.body.textContent || ""; +} + const hideCarousel = function() { // show popover document.getElementById('popover').style.opacity = '0'; diff --git a/styles.css b/styles.css index b2f4fc5..3291ebf 100644 --- a/styles.css +++ b/styles.css @@ -50,6 +50,12 @@ margin-bottom: 1px !important; } +.carousel .card-text { + font-size: 1.4em; + overflow: hidden; + max-height: 60vh; +} + .card { font-size: 0.9em; /* adjust this value to get the desired text size */ } @@ -186,10 +192,6 @@ body { margin-bottom: 20px !important; } -.card-text ~ p { - font-size: 1.4em; -} - .card-img-bottom { max-width: 600px; max-height: 500px; @@ -201,6 +203,7 @@ body { margin-top: 0px !important; margin-bottom: 10px !important; align-items: center; + float: right; } .text-muted {