deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject svn commit: r1353875 - in /deltacloud/trunk/site: content/assets/js/application.js content/assets/js/jquery.tweet.js output/assets/js/application.js output/assets/js/jquery.tweet.js
Date Tue, 26 Jun 2012 08:57:43 GMT
Author: mfojtik
Date: Tue Jun 26 08:57:42 2012
New Revision: 1353875

URL: http://svn.apache.org/viewvc?rev=1353875&view=rev
Log:
Site: Updated jquery.tweet

Modified:
    deltacloud/trunk/site/content/assets/js/application.js
    deltacloud/trunk/site/content/assets/js/jquery.tweet.js
    deltacloud/trunk/site/output/assets/js/application.js
    deltacloud/trunk/site/output/assets/js/jquery.tweet.js

Modified: deltacloud/trunk/site/content/assets/js/application.js
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/assets/js/application.js?rev=1353875&r1=1353874&r2=1353875&view=diff
==============================================================================
--- deltacloud/trunk/site/content/assets/js/application.js (original)
+++ deltacloud/trunk/site/content/assets/js/application.js Tue Jun 26 08:57:42 2012
@@ -1,7 +1,7 @@
 $(document).ready(function() {
   $(".tweet").tweet({
     username: "deltacloud",
-    query : '#deltacloud OR @deltacloud',
+    query : '#deltacloud',
     join_text: "auto",
     avatar_size: 32,
     count: 2,

Modified: deltacloud/trunk/site/content/assets/js/jquery.tweet.js
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/content/assets/js/jquery.tweet.js?rev=1353875&r1=1353874&r2=1353875&view=diff
==============================================================================
--- deltacloud/trunk/site/content/assets/js/jquery.tweet.js (original)
+++ deltacloud/trunk/site/content/assets/js/jquery.tweet.js Tue Jun 26 08:57:42 2012
@@ -1,6 +1,11 @@
 // jquery.tweet.js - See http://tweet.seaofclouds.com/ or https://github.com/seaofclouds/tweet
for more info
 // Copyright (c) 2008-2011 Todd Matthews & Steve Purcell
-(function($) {
+(function (factory) {
+  if (typeof define === 'function' && define.amd)
+    define(['jquery'], factory); // AMD support for RequireJS etc.
+  else
+    factory(jQuery);
+}(function ($) {
   $.fn.tweet = function(o){
     var s = $.extend({
       username: null,                           // [string or array] required unless using
the 'query' option; one or more twitter screen names (use 'list' option for multiple names,
where possible)
@@ -15,13 +20,13 @@
       intro_text: null,                         // [string]   do you want text BEFORE your
your tweets?
       outro_text: null,                         // [string]   do you want text AFTER your
tweets?
       join_text:  null,                         // [string]   optional text in between date
and tweet, try setting to "auto"
-      auto_join_text_default: "i said,",        // [string]   auto text for non verb: "i
said" bullocks
-      auto_join_text_ed: "i",                   // [string]   auto text for past tense: "i"
surfed
-      auto_join_text_ing: "i am",               // [string]   auto tense for present tense:
"i was" surfing
-      auto_join_text_reply: "i replied to",     // [string]   auto tense for replies: "i
replied to" @someone "with"
-      auto_join_text_url: "i was looking at",   // [string]   auto tense for urls: "i was
looking at" http:...
+      auto_join_text_default: "I said,",        // [string]   auto text for non verb: "I
said" bullocks
+      auto_join_text_ed: "I",                   // [string]   auto text for past tense: "I"
surfed
+      auto_join_text_ing: "I am",               // [string]   auto tense for present tense:
"I was" surfing
+      auto_join_text_reply: "I replied to",     // [string]   auto tense for replies: "I
replied to" @someone "with"
+      auto_join_text_url: "I was looking at",   // [string]   auto tense for urls: "I was
looking at" http:...
       loading_text: null,                       // [string]   optional loading text, displayed
while tweets load
-      refresh_interval: null ,                  // [integer]  optional number of seconds
after which to reload tweets
+      refresh_interval: null,                   // [integer]  optional number of seconds
after which to reload tweets
       twitter_url: "twitter.com",               // [string]   custom twitter url, if any
(apigee, etc.)
       twitter_api_url: "api.twitter.com",       // [string]   custom twitter api url, if
any (apigee, etc.)
       twitter_search_url: "search.twitter.com", // [string]   custom twitter search url,
if any (apigee, etc.)
@@ -32,10 +37,12 @@
       filter: function(tweet) {                 // [function] whether or not to include a
particular tweet (be sure to also set 'fetch')
         return true;
       }
+      // You can attach callbacks to the following events using jQuery's standard .bind()
mechanism:
+      //   "loaded" -- triggered when tweets have been fetched and rendered
     }, o);
 
     // See http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-    var url_regexp = /\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
+    var url_regexp = /\b((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
 
     // Expand values inside simple string templates with {placeholders}
     function t(template, info) {
@@ -61,20 +68,36 @@
       };
     }
 
+    function escapeHTML(s) {
+      return s.replace(/</g,"&lt;").replace(/>/g,"^&gt;");
+    }
+
     $.fn.extend({
-      linkUrl: replacer(url_regexp, function(match) {
-        var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match;
-        return "<a href=\""+url+"\">"+match+"</a>";
-      }),
-      linkUser: replacer(/@(\w+)/gi, "@<a href=\"http://"+s.twitter_url+"/$1\">$1</a>"),
+      linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1<span class=\"at\">@</span><a
href=\"http://"+s.twitter_url+"/$2\">$2</a>"),
       // Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars
       linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi,
-                         ' <a href="http://'+s.twitter_search_url+'/search?q=&tag=$1&lang=all'+((s.username
&& s.username.length == 1 && !s.list) ? '&from='+s.username.join("%2BOR%2B")
: '')+'">#$1</a>'),
-      capAwesome: replacer(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'),
-      capEpic: replacer(/\b(epic)\b/gi, '<span class="epic">$1</span>'),
+                         ' <a href="http://'+s.twitter_search_url+'/search?q=&tag=$1&lang=all'+
+                         ((s.username && s.username.length == 1 && !s.list)
? '&from='+s.username.join("%2BOR%2B") : '')+
+                         '" class="tweet_hashtag">#$1</a>'),
       makeHeart: replacer(/(&lt;)+[3]/gi, "<tt class='heart'>&#x2665;</tt>")
     });
 
+    function linkURLs(text, entities) {
+      return text.replace(url_regexp, function(match) {
+        var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match;
+        var text = match;
+        for(var i = 0; i < entities.length; ++i) {
+          var entity = entities[i];
+          if (entity.url == url && entity.expanded_url) {
+            url = entity.expanded_url;
+            text = entity.display_url;
+            break;
+          }
+        }
+        return "<a href=\""+escapeHTML(url)+"\">"+escapeHTML(text)+"</a>";
+      });
+    }
+
     function parse_date(date_str) {
       // The non-search twitter APIs return inconsistently-formatted dates, which Date.parse
       // cannot handle in IE. We therefore perform the following transformation:
@@ -82,26 +105,27 @@
       return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3'));
     }
 
-    function relative_time(date) {
-      var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
-      var delta = parseInt((relative_to.getTime() - date) / 1000, 10);
-      var r = '';
-      if (delta < 60) {
-        r = delta + ' seconds ago';
-      } else if(delta < 120) {
-        r = 'a minute ago';
-      } else if(delta < (45*60)) {
-        r = (parseInt(delta / 60, 10)).toString() + ' minutes ago';
-      } else if(delta < (2*60*60)) {
-        r = 'an hour ago';
-      } else if(delta < (24*60*60)) {
-        r = '' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
-      } else if(delta < (48*60*60)) {
-        r = 'a day ago';
-      } else {
-        r = (parseInt(delta / 86400, 10)).toString() + ' days ago';
-      }
-      return 'about ' + r;
+    function extract_relative_time(date) {
+      var toInt = function(val) { return parseInt(val, 10); };
+      var relative_to = new Date();
+      var delta = toInt((relative_to.getTime() - date) / 1000);
+      if (delta < 1) delta = 0;
+      return {
+        days:    toInt(delta / 86400),
+        hours:   toInt(delta / 3600),
+        minutes: toInt(delta / 60),
+        seconds: toInt(delta)
+      };
+    }
+
+    function format_relative_time(time_ago) {
+      if ( time_ago.days > 2 )     return 'about ' + time_ago.days + ' days ago';
+      if ( time_ago.hours > 24 )   return 'about a day ago';
+      if ( time_ago.hours > 2 )    return 'about ' + time_ago.hours + ' hours ago';
+      if ( time_ago.minutes > 45 ) return 'about an hour ago';
+      if ( time_ago.minutes > 2 )  return 'about ' + time_ago.minutes + ' minutes ago';
+      if ( time_ago.seconds > 1 )  return 'about ' + time_ago.seconds + ' seconds ago';
+      return 'just now';
     }
 
     function build_auto_join_text(text) {
@@ -121,15 +145,16 @@
     function build_api_url() {
       var proto = ('https:' == document.location.protocol ? 'https:' : 'http:');
       var count = (s.fetch === null) ? s.count : s.fetch;
+      var common_params = '&include_entities=1&callback=?';
       if (s.list) {
-        return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+"&callback=?";
+        return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+common_params;
       } else if (s.favorites) {
-        return proto+"//"+s.twitter_api_url+"/favorites/"+s.username[0]+".json?page="+s.page+"&count="+count+"&callback=?";
+        return proto+"//"+s.twitter_api_url+"/favorites/"+s.username[0]+".json?page="+s.page+"&count="+count+common_params;
       } else if (s.query === null && s.username.length == 1) {
-        return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets
? '&include_rts=1' : '')+'&page='+s.page+'&callback=?';
+        return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets
? '&include_rts=1' : '')+'&page='+s.page+common_params;
       } else {
         var query = (s.query || 'from:'+s.username.join(' OR from:'));
-        return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+'&callback=?';
+        return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+common_params;
       }
     }
 
@@ -137,7 +162,8 @@
       if (secure) {
         return ('user' in item) ?
           item.user.profile_image_url_https :
-          extract_avatar_url(item, false);
+          extract_avatar_url(item, false).
+            replace(/^http:\/\/[a-z0-9]{1,3}\.twimg\.com\//, "https://s3.amazonaws.com/twitter_production/");
       } else {
         return item.profile_image_url || item.user.profile_image_url;
       }
@@ -150,6 +176,9 @@
       o.item = item;
       o.source = item.source;
       o.screen_name = item.from_user || item.user.screen_name;
+      // The actual user name is not returned by all Twitter APIs, so please do not
+      // file an issue if it is empty:
+      o.name = item.from_user_name || item.user.name;
       o.avatar_size = s.avatar_size;
       o.avatar_url = extract_avatar_url(item, (document.location.protocol === 'https:'));
       o.retweet = typeof(item.retweeted_status) != 'undefined';
@@ -163,10 +192,11 @@
       o.retweet_url = o.twitter_base+"intent/retweet?tweet_id="+o.tweet_id;
       o.favorite_url = o.twitter_base+"intent/favorite?tweet_id="+o.tweet_id;
       o.retweeted_screen_name = o.retweet && item.retweeted_status.user.screen_name;
-      o.tweet_relative_time = relative_time(o.tweet_time);
+      o.tweet_relative_time = format_relative_time(extract_relative_time(o.tweet_time));
+      o.entities = item.entities ? (item.entities.urls || []).concat(item.entities.media
|| []) : [];
       o.tweet_raw_text = o.retweet ? ('RT @'+o.retweeted_screen_name+' '+item.retweeted_status.text)
: item.text; // avoid '...' in long retweets
-      o.tweet_text = $([o.tweet_raw_text]).linkUrl().linkUser().linkHash()[0];
-      o.tweet_text_fancy = $([o.tweet_text]).makeHeart().capAwesome().capEpic()[0];
+      o.tweet_text = $([linkURLs(o.tweet_raw_text, o.entities)]).linkUser().linkHash()[0];
+      o.tweet_text_fancy = $([o.tweet_text]).makeHeart()[0];
 
       // Default spans, and pre-formatted blocks for common layouts
       o.user = t('<a class="tweet_user" href="{user_url}">{screen_name}</a>',
o);
@@ -181,38 +211,39 @@
       return o;
     }
 
-    return this.each(function(i, widget){
-      var list = $('<ul class="tweet_list">');
+    function load(widget) {
       var intro = '<p class="tweet_intro">'+s.intro_text+'</p>';
       var outro = '<p class="tweet_outro">'+s.outro_text+'</p>';
       var loading = $('<p class="loading">'+s.loading_text+'</p>');
+      if (s.loading_text) $(widget).not(":has(.tweet_list)").empty().append(loading);
+      $.getJSON(build_api_url(), function(data){
+        var list = $('<ul class="tweet_list">');
+        var tweets = $.map(data.results || data, extract_template_data);
+        tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count);
+        list.append($.map(tweets, function(o) { return "<li>" + t(s.template, o) +
"</li>"; }).join('')).
+          children('li:first').addClass('tweet_first').end().
+          children('li:odd').addClass('tweet_even').end().
+          children('li:even').addClass('tweet_odd');
+
+        $(widget).empty().append(list);
+        if (s.intro_text) list.before(intro);
+        if (s.outro_text) list.after(outro);
+
+        $(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full"));
+        if (s.refresh_interval) {
+          window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval);
+        }
+      });
+    }
 
+    return this.each(function(i, widget){
       if(s.username && typeof(s.username) == "string"){
         s.username = [s.username];
       }
 
-      $(widget).bind("tweet:load", function(){
-        if (s.loading_text) $(widget).empty().append(loading);
-        $.getJSON(build_api_url(), function(data){
-          $(widget).empty().append(list);
-          if (s.intro_text) list.before(intro);
-          list.empty();
-
-          var tweets = $.map(data.results || data, extract_template_data);
-          tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count);
-          list.append($.map(tweets, function(o) { return "<li>" + t(s.template, o)
+ "</li>"; }).join('')).
-              children('li:first').addClass('tweet_first').end().
-              children('li:odd').addClass('tweet_even').end().
-              children('li:even').addClass('tweet_odd');
-
-          if (s.outro_text) list.after(outro);
-          $(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full"));
-          if (s.refresh_interval) {
-            window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval);
-          }
-        });
+      $(widget).unbind("tweet:load").bind("tweet:load", function(){
+        load(widget);
       }).trigger("tweet:load");
     });
   };
-})(jQuery);
-
+}));

Modified: deltacloud/trunk/site/output/assets/js/application.js
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/assets/js/application.js?rev=1353875&r1=1353874&r2=1353875&view=diff
==============================================================================
--- deltacloud/trunk/site/output/assets/js/application.js (original)
+++ deltacloud/trunk/site/output/assets/js/application.js Tue Jun 26 08:57:42 2012
@@ -1,7 +1,7 @@
 $(document).ready(function() {
   $(".tweet").tweet({
     username: "deltacloud",
-    query : '#deltacloud OR @deltacloud',
+    query : '#deltacloud',
     join_text: "auto",
     avatar_size: 32,
     count: 2,

Modified: deltacloud/trunk/site/output/assets/js/jquery.tweet.js
URL: http://svn.apache.org/viewvc/deltacloud/trunk/site/output/assets/js/jquery.tweet.js?rev=1353875&r1=1353874&r2=1353875&view=diff
==============================================================================
--- deltacloud/trunk/site/output/assets/js/jquery.tweet.js (original)
+++ deltacloud/trunk/site/output/assets/js/jquery.tweet.js Tue Jun 26 08:57:42 2012
@@ -1,6 +1,11 @@
 // jquery.tweet.js - See http://tweet.seaofclouds.com/ or https://github.com/seaofclouds/tweet
for more info
 // Copyright (c) 2008-2011 Todd Matthews & Steve Purcell
-(function($) {
+(function (factory) {
+  if (typeof define === 'function' && define.amd)
+    define(['jquery'], factory); // AMD support for RequireJS etc.
+  else
+    factory(jQuery);
+}(function ($) {
   $.fn.tweet = function(o){
     var s = $.extend({
       username: null,                           // [string or array] required unless using
the 'query' option; one or more twitter screen names (use 'list' option for multiple names,
where possible)
@@ -15,13 +20,13 @@
       intro_text: null,                         // [string]   do you want text BEFORE your
your tweets?
       outro_text: null,                         // [string]   do you want text AFTER your
tweets?
       join_text:  null,                         // [string]   optional text in between date
and tweet, try setting to "auto"
-      auto_join_text_default: "i said,",        // [string]   auto text for non verb: "i
said" bullocks
-      auto_join_text_ed: "i",                   // [string]   auto text for past tense: "i"
surfed
-      auto_join_text_ing: "i am",               // [string]   auto tense for present tense:
"i was" surfing
-      auto_join_text_reply: "i replied to",     // [string]   auto tense for replies: "i
replied to" @someone "with"
-      auto_join_text_url: "i was looking at",   // [string]   auto tense for urls: "i was
looking at" http:...
+      auto_join_text_default: "I said,",        // [string]   auto text for non verb: "I
said" bullocks
+      auto_join_text_ed: "I",                   // [string]   auto text for past tense: "I"
surfed
+      auto_join_text_ing: "I am",               // [string]   auto tense for present tense:
"I was" surfing
+      auto_join_text_reply: "I replied to",     // [string]   auto tense for replies: "I
replied to" @someone "with"
+      auto_join_text_url: "I was looking at",   // [string]   auto tense for urls: "I was
looking at" http:...
       loading_text: null,                       // [string]   optional loading text, displayed
while tweets load
-      refresh_interval: null ,                  // [integer]  optional number of seconds
after which to reload tweets
+      refresh_interval: null,                   // [integer]  optional number of seconds
after which to reload tweets
       twitter_url: "twitter.com",               // [string]   custom twitter url, if any
(apigee, etc.)
       twitter_api_url: "api.twitter.com",       // [string]   custom twitter api url, if
any (apigee, etc.)
       twitter_search_url: "search.twitter.com", // [string]   custom twitter search url,
if any (apigee, etc.)
@@ -32,10 +37,12 @@
       filter: function(tweet) {                 // [function] whether or not to include a
particular tweet (be sure to also set 'fetch')
         return true;
       }
+      // You can attach callbacks to the following events using jQuery's standard .bind()
mechanism:
+      //   "loaded" -- triggered when tweets have been fetched and rendered
     }, o);
 
     // See http://daringfireball.net/2010/07/improved_regex_for_matching_urls
-    var url_regexp = /\b((?:[a-z][\w-]+:(?:\/{1,3}|[a-z0-9%])|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
+    var url_regexp = /\b((?:https?:\/\/|www\d{0,3}[.]|[a-z0-9.\-]+[.][a-z]{2,4}\/)(?:[^\s()<>]+|\(([^\s()<>]+|(\([^\s()<>]+\)))*\))+(?:\(([^\s()<>]+|(\([^\s()<>]+\)))*\)|[^\s`!()\[\]{};:'".,<>?«»“”‘’]))/gi;
 
     // Expand values inside simple string templates with {placeholders}
     function t(template, info) {
@@ -61,20 +68,36 @@
       };
     }
 
+    function escapeHTML(s) {
+      return s.replace(/</g,"&lt;").replace(/>/g,"^&gt;");
+    }
+
     $.fn.extend({
-      linkUrl: replacer(url_regexp, function(match) {
-        var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match;
-        return "<a href=\""+url+"\">"+match+"</a>";
-      }),
-      linkUser: replacer(/@(\w+)/gi, "@<a href=\"http://"+s.twitter_url+"/$1\">$1</a>"),
+      linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1<span class=\"at\">@</span><a
href=\"http://"+s.twitter_url+"/$2\">$2</a>"),
       // Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars
       linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi,
-                         ' <a href="http://'+s.twitter_search_url+'/search?q=&tag=$1&lang=all'+((s.username
&& s.username.length == 1 && !s.list) ? '&from='+s.username.join("%2BOR%2B")
: '')+'">#$1</a>'),
-      capAwesome: replacer(/\b(awesome)\b/gi, '<span class="awesome">$1</span>'),
-      capEpic: replacer(/\b(epic)\b/gi, '<span class="epic">$1</span>'),
+                         ' <a href="http://'+s.twitter_search_url+'/search?q=&tag=$1&lang=all'+
+                         ((s.username && s.username.length == 1 && !s.list)
? '&from='+s.username.join("%2BOR%2B") : '')+
+                         '" class="tweet_hashtag">#$1</a>'),
       makeHeart: replacer(/(&lt;)+[3]/gi, "<tt class='heart'>&#x2665;</tt>")
     });
 
+    function linkURLs(text, entities) {
+      return text.replace(url_regexp, function(match) {
+        var url = (/^[a-z]+:/i).test(match) ? match : "http://"+match;
+        var text = match;
+        for(var i = 0; i < entities.length; ++i) {
+          var entity = entities[i];
+          if (entity.url == url && entity.expanded_url) {
+            url = entity.expanded_url;
+            text = entity.display_url;
+            break;
+          }
+        }
+        return "<a href=\""+escapeHTML(url)+"\">"+escapeHTML(text)+"</a>";
+      });
+    }
+
     function parse_date(date_str) {
       // The non-search twitter APIs return inconsistently-formatted dates, which Date.parse
       // cannot handle in IE. We therefore perform the following transformation:
@@ -82,26 +105,27 @@
       return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3'));
     }
 
-    function relative_time(date) {
-      var relative_to = (arguments.length > 1) ? arguments[1] : new Date();
-      var delta = parseInt((relative_to.getTime() - date) / 1000, 10);
-      var r = '';
-      if (delta < 60) {
-        r = delta + ' seconds ago';
-      } else if(delta < 120) {
-        r = 'a minute ago';
-      } else if(delta < (45*60)) {
-        r = (parseInt(delta / 60, 10)).toString() + ' minutes ago';
-      } else if(delta < (2*60*60)) {
-        r = 'an hour ago';
-      } else if(delta < (24*60*60)) {
-        r = '' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
-      } else if(delta < (48*60*60)) {
-        r = 'a day ago';
-      } else {
-        r = (parseInt(delta / 86400, 10)).toString() + ' days ago';
-      }
-      return 'about ' + r;
+    function extract_relative_time(date) {
+      var toInt = function(val) { return parseInt(val, 10); };
+      var relative_to = new Date();
+      var delta = toInt((relative_to.getTime() - date) / 1000);
+      if (delta < 1) delta = 0;
+      return {
+        days:    toInt(delta / 86400),
+        hours:   toInt(delta / 3600),
+        minutes: toInt(delta / 60),
+        seconds: toInt(delta)
+      };
+    }
+
+    function format_relative_time(time_ago) {
+      if ( time_ago.days > 2 )     return 'about ' + time_ago.days + ' days ago';
+      if ( time_ago.hours > 24 )   return 'about a day ago';
+      if ( time_ago.hours > 2 )    return 'about ' + time_ago.hours + ' hours ago';
+      if ( time_ago.minutes > 45 ) return 'about an hour ago';
+      if ( time_ago.minutes > 2 )  return 'about ' + time_ago.minutes + ' minutes ago';
+      if ( time_ago.seconds > 1 )  return 'about ' + time_ago.seconds + ' seconds ago';
+      return 'just now';
     }
 
     function build_auto_join_text(text) {
@@ -121,15 +145,16 @@
     function build_api_url() {
       var proto = ('https:' == document.location.protocol ? 'https:' : 'http:');
       var count = (s.fetch === null) ? s.count : s.fetch;
+      var common_params = '&include_entities=1&callback=?';
       if (s.list) {
-        return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+"&callback=?";
+        return proto+"//"+s.twitter_api_url+"/1/"+s.username[0]+"/lists/"+s.list+"/statuses.json?page="+s.page+"&per_page="+count+common_params;
       } else if (s.favorites) {
-        return proto+"//"+s.twitter_api_url+"/favorites/"+s.username[0]+".json?page="+s.page+"&count="+count+"&callback=?";
+        return proto+"//"+s.twitter_api_url+"/favorites/"+s.username[0]+".json?page="+s.page+"&count="+count+common_params;
       } else if (s.query === null && s.username.length == 1) {
-        return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets
? '&include_rts=1' : '')+'&page='+s.page+'&callback=?';
+        return proto+'//'+s.twitter_api_url+'/1/statuses/user_timeline.json?screen_name='+s.username[0]+'&count='+count+(s.retweets
? '&include_rts=1' : '')+'&page='+s.page+common_params;
       } else {
         var query = (s.query || 'from:'+s.username.join(' OR from:'));
-        return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+'&callback=?';
+        return proto+'//'+s.twitter_search_url+'/search.json?&q='+encodeURIComponent(query)+'&rpp='+count+'&page='+s.page+common_params;
       }
     }
 
@@ -137,7 +162,8 @@
       if (secure) {
         return ('user' in item) ?
           item.user.profile_image_url_https :
-          extract_avatar_url(item, false);
+          extract_avatar_url(item, false).
+            replace(/^http:\/\/[a-z0-9]{1,3}\.twimg\.com\//, "https://s3.amazonaws.com/twitter_production/");
       } else {
         return item.profile_image_url || item.user.profile_image_url;
       }
@@ -150,6 +176,9 @@
       o.item = item;
       o.source = item.source;
       o.screen_name = item.from_user || item.user.screen_name;
+      // The actual user name is not returned by all Twitter APIs, so please do not
+      // file an issue if it is empty:
+      o.name = item.from_user_name || item.user.name;
       o.avatar_size = s.avatar_size;
       o.avatar_url = extract_avatar_url(item, (document.location.protocol === 'https:'));
       o.retweet = typeof(item.retweeted_status) != 'undefined';
@@ -163,10 +192,11 @@
       o.retweet_url = o.twitter_base+"intent/retweet?tweet_id="+o.tweet_id;
       o.favorite_url = o.twitter_base+"intent/favorite?tweet_id="+o.tweet_id;
       o.retweeted_screen_name = o.retweet && item.retweeted_status.user.screen_name;
-      o.tweet_relative_time = relative_time(o.tweet_time);
+      o.tweet_relative_time = format_relative_time(extract_relative_time(o.tweet_time));
+      o.entities = item.entities ? (item.entities.urls || []).concat(item.entities.media
|| []) : [];
       o.tweet_raw_text = o.retweet ? ('RT @'+o.retweeted_screen_name+' '+item.retweeted_status.text)
: item.text; // avoid '...' in long retweets
-      o.tweet_text = $([o.tweet_raw_text]).linkUrl().linkUser().linkHash()[0];
-      o.tweet_text_fancy = $([o.tweet_text]).makeHeart().capAwesome().capEpic()[0];
+      o.tweet_text = $([linkURLs(o.tweet_raw_text, o.entities)]).linkUser().linkHash()[0];
+      o.tweet_text_fancy = $([o.tweet_text]).makeHeart()[0];
 
       // Default spans, and pre-formatted blocks for common layouts
       o.user = t('<a class="tweet_user" href="{user_url}">{screen_name}</a>',
o);
@@ -181,38 +211,39 @@
       return o;
     }
 
-    return this.each(function(i, widget){
-      var list = $('<ul class="tweet_list">');
+    function load(widget) {
       var intro = '<p class="tweet_intro">'+s.intro_text+'</p>';
       var outro = '<p class="tweet_outro">'+s.outro_text+'</p>';
       var loading = $('<p class="loading">'+s.loading_text+'</p>');
+      if (s.loading_text) $(widget).not(":has(.tweet_list)").empty().append(loading);
+      $.getJSON(build_api_url(), function(data){
+        var list = $('<ul class="tweet_list">');
+        var tweets = $.map(data.results || data, extract_template_data);
+        tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count);
+        list.append($.map(tweets, function(o) { return "<li>" + t(s.template, o) +
"</li>"; }).join('')).
+          children('li:first').addClass('tweet_first').end().
+          children('li:odd').addClass('tweet_even').end().
+          children('li:even').addClass('tweet_odd');
+
+        $(widget).empty().append(list);
+        if (s.intro_text) list.before(intro);
+        if (s.outro_text) list.after(outro);
+
+        $(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full"));
+        if (s.refresh_interval) {
+          window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval);
+        }
+      });
+    }
 
+    return this.each(function(i, widget){
       if(s.username && typeof(s.username) == "string"){
         s.username = [s.username];
       }
 
-      $(widget).bind("tweet:load", function(){
-        if (s.loading_text) $(widget).empty().append(loading);
-        $.getJSON(build_api_url(), function(data){
-          $(widget).empty().append(list);
-          if (s.intro_text) list.before(intro);
-          list.empty();
-
-          var tweets = $.map(data.results || data, extract_template_data);
-          tweets = $.grep(tweets, s.filter).sort(s.comparator).slice(0, s.count);
-          list.append($.map(tweets, function(o) { return "<li>" + t(s.template, o)
+ "</li>"; }).join('')).
-              children('li:first').addClass('tweet_first').end().
-              children('li:odd').addClass('tweet_even').end().
-              children('li:even').addClass('tweet_odd');
-
-          if (s.outro_text) list.after(outro);
-          $(widget).trigger("loaded").trigger((tweets.length === 0 ? "empty" : "full"));
-          if (s.refresh_interval) {
-            window.setTimeout(function() { $(widget).trigger("tweet:load"); }, 1000 * s.refresh_interval);
-          }
-        });
+      $(widget).unbind("tweet:load").bind("tweet:load", function(){
+        load(widget);
       }).trigger("tweet:load");
     });
   };
-})(jQuery);
-
+}));



Mime
View raw message