From 579142c28b498cdfda5c1c2ae87da737846097ae Mon Sep 17 00:00:00 2001 From: Brandon Mathis Date: Thu, 29 Sep 2011 19:55:11 -0500 Subject: fixed issue with expanded twitter urls, fixed issue where twitter would report seven day old tweets as "false" --- .themes/classic/source/javascripts/twitter.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to '.themes') diff --git a/.themes/classic/source/javascripts/twitter.js b/.themes/classic/source/javascripts/twitter.js index b6fb0d87..27afb43e 100644 --- a/.themes/classic/source/javascripts/twitter.js +++ b/.themes/classic/source/javascripts/twitter.js @@ -1,12 +1,12 @@ // JSON-P Twitter fetcher for Octopress -// (c) Brandon Mathis // MIT Lisence +// (c) Brandon Mathis // MIT License /* Sky Slavin, Ludopoli. MIT license. * based on JavaScript Pretty Date * Copyright (c) 2008 John Resig (jquery.com) * Licensed under the MIT license. */ function prettyDate(time) { if (navigator.appName === 'Microsoft Internet Explorer') { return "∞"; // because IE date parsing isn't fun. } - + console.log(time); var say = { just_now: " now", minute_ago: "1m", @@ -15,6 +15,7 @@ function prettyDate(time) { hours_ago: "h", yesterday: "1d", days_ago: "d", + last_week: "1w", weeks_ago: "w" }; @@ -35,6 +36,7 @@ function prettyDate(time) { diff < 86400 && Math.floor(diff / 3600) + say.hours_ago) || day_diff === 1 && say.yesterday || day_diff < 7 && day_diff + say.days_ago || + day_diff === 7 && say.last_week || day_diff > 7 && Math.ceil(day_diff / 7) + say.weeks_ago; } @@ -47,8 +49,10 @@ function linkifyTweet(text, url) { // Use twitter's api to replace t.co shortened urls with expanded ones. for (var u in url) { if(url[u].expanded_url != null){ - var shortUrl = new RegExp( url[u].url.replace(/https?:\/\//, ''), 'g'); - text = text.replace(shortUrl, url[u].display_url); + var shortUrl = new RegExp(url[u].url, 'g'); + text = text.replace(shortUrl, url[u].expanded_url); + var shortUrl = new RegExp(">"+(url[u].url.replace(/https?:\/\//, '')), 'g'); + text = text.replace(shortUrl, ">"+url[u].display_url); } } return text -- cgit v1.2.1