diff --git a/README.md b/README.md
index 78ec372..826547d 100644
--- a/README.md
+++ b/README.md
@@ -33,6 +33,7 @@ $(document).ready(function() {
modpath: '/assets/twitter/',
count: 5,
loading_text: 'loading twitter feed...',
+ shopics: true, //to show pics from tweets like 
/* etc... */
});
diff --git a/twitter/jquery.tweet.js b/twitter/jquery.tweet.js
old mode 100644
new mode 100755
index e2c3611..9b16bcf
--- a/twitter/jquery.tweet.js
+++ b/twitter/jquery.tweet.js
@@ -3,309 +3,321 @@
// Modified by Stan Scates for https://github.com/StanScates/Tweet.js-Mod
(function (factory) {
- if (typeof define === 'function' && define.amd)
- define(['jquery'], factory); // AMD support for RequireJS etc.
- else
- factory(jQuery);
+ 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({
- modpath: "/twitter/", // [string] relative URL to Tweet.js mod (see https://github.com/StanScates/Tweet.js-Mod)
- 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)
- list_id: null, // [integer] ID of list to fetch when using list functionality
- list: null, // [string] optional slug of list belonging to username
- favorites: false, // [boolean] display the user's favorites instead of his tweets
- query: null, // [string] optional search query (see also: http://search.twitter.com/operators)
- avatar_size: null, // [integer] height and width of avatar if displayed (48px max)
- count: 3, // [integer] how many tweets to display?
- fetch: null, // [integer] how many tweets to fetch via the API (set this higher than 'count' if using the 'filter' option)
- page: 1, // [integer] which page of results to fetch (if count != fetch, you'll get unexpected results)
- retweets: true, // [boolean] whether to fetch (official) retweets (not supported in all display modes)
- 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:...
- loading_text: null, // [string] optional loading text, displayed while tweets load
- 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: "api.twitter.com", // [string] custom twitter search url, if any (apigee, etc.)
- template: "{avatar}{time}{join}{text}", // [string or function] template used to construct each tweet - see code for available vars
- comparator: function(tweet1, tweet2) { // [function] comparator used to sort tweets (see Array.sort)
- return tweet2["tweet_time"] - tweet1["tweet_time"];
- },
- 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);
+ $.fn.tweet = function(o){
+ var s = $.extend({
+ modpath: "/twitter/", // [string] relative URL to Tweet.js mod (see https://github.com/StanScates/Tweet.js-Mod)
+ showpics: false, // [booelan] show pics ![]()
+ 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)
+ list_id: null, // [integer] ID of list to fetch when using list functionality
+ list: null, // [string] optional slug of list belonging to username
+ favorites: false, // [boolean] display the user's favorites instead of his tweets
+ query: null, // [string] optional search query (see also: http://search.twitter.com/operators)
+ avatar_size: null, // [integer] height and width of avatar if displayed (48px max)
+ count: 3, // [integer] how many tweets to display?
+ fetch: null, // [integer] how many tweets to fetch via the API (set this higher than 'count' if using the 'filter' option)
+ page: 1, // [integer] which page of results to fetch (if count != fetch, you'll get unexpected results)
+ retweets: true, // [boolean] whether to fetch (official) retweets (not supported in all display modes)
+ 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:...
+ loading_text: null, // [string] optional loading text, displayed while tweets load
+ 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: "api.twitter.com", // [string] custom twitter search url, if any (apigee, etc.)
+ template: "{avatar}{time}{join}{text}", // [string or function] template used to construct each tweet - see code for available vars
+ comparator: function(tweet1, tweet2) { // [function] comparator used to sort tweets (see Array.sort)
+ return tweet2["tweet_time"] - tweet1["tweet_time"];
+ },
+ 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;
+ // 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;
- // Expand values inside simple string templates with {placeholders}
- function t(template, info) {
- if (typeof template === "string") {
- var result = template;
- for(var key in info) {
- var val = info[key];
- result = result.replace(new RegExp('{'+key+'}','g'), val === null ? '' : val);
- }
- return result;
- } else return template(info);
- }
- // Export the t function for use when passing a function as the 'template' option
- $.extend({tweet: {t: t}});
+ // Expand values inside simple string templates with {placeholders}
+ function t(template, info) {
+ if (typeof template === "string") {
+ var result = template;
+ for(var key in info) {
+ var val = info[key];
+ result = result.replace(new RegExp('{'+key+'}','g'), val === null ? '' : val);
+ }
+ return result;
+ } else return template(info);
+ }
+ // Export the t function for use when passing a function as the 'template' option
+ $.extend({tweet: {t: t}});
- function replacer (regex, replacement) {
- return function() {
- var returning = [];
- this.each(function() {
- returning.push(this.replace(regex, replacement));
- });
- return $(returning);
- };
- }
+ function replacer (regex, replacement) {
+ return function() {
+ var returning = [];
+ this.each(function() {
+ returning.push(this.replace(regex, replacement));
+ });
+ return $(returning);
+ };
+ }
- function escapeHTML(s) {
- return s.replace(//g,"^>");
- }
+ function escapeHTML(s) {
+ return s.replace(//g,"^>");
+ }
- $.fn.extend({
- linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1@$2"),
- // Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars
- linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi,
- ' '),
- makeHeart: replacer(/(<)+[3]/gi, "♥")
- });
+ $.fn.extend({
+ linkUser: replacer(/(^|[\W])@(\w+)/gi, "$1@$2"),
+ // Support various latin1 (\u00**) and arabic (\u06**) alphanumeric chars
+ linkHash: replacer(/(?:^| )[\#]+([\w\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u00ff\u0600-\u06ff]+)/gi,
+ ' '),
+ makeHeart: replacer(/(<)+[3]/gi, "♥")
+ });
- 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 ""+escapeHTML(text)+"";
- });
- }
+ 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;
+ media = entity.media_url;
+ break;
+ }
+ }
+ var ret = ""+escapeHTML(text)+"";
- 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:
- // "Wed Apr 29 08:53:31 +0000 2009" => "Wed, Apr 29 2009 08:53:31 +0000"
- return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3'));
- }
+ if( s.showpics )
+ {
+ if( text.indexOf( "pic.twitter.com" ) !== -1 )
+ {
+ ret = "![]("+media+")
";
+ }
+ }
- 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 < 1) {
- r = 'just now';
- } else if (delta < 60) {
- r = delta + ' seconds ago';
- } else if(delta < 120) {
- r = 'about a minute ago';
- } else if(delta < (45*60)) {
- r = 'about ' + (parseInt(delta / 60, 10)).toString() + ' minutes ago';
- } else if(delta < (2*60*60)) {
- r = 'about an hour ago';
- } else if(delta < (24*60*60)) {
- r = 'about ' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
- } else if(delta < (48*60*60)) {
- r = 'about a day ago';
- } else {
- r = 'about ' + (parseInt(delta / 86400, 10)).toString() + ' days ago';
- }
- return r;
- }
+ return ret;
+ });
+ }
- function build_auto_join_text(text) {
- if (text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) {
- return s.auto_join_text_reply;
- } else if (text.match(url_regexp)) {
- return s.auto_join_text_url;
- } else if (text.match(/^((\w+ed)|just) .*/im)) {
- return s.auto_join_text_ed;
- } else if (text.match(/^(\w*ing) .*/i)) {
- return s.auto_join_text_ing;
- } else {
- return s.auto_join_text_default;
- }
- }
+ 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:
+ // "Wed Apr 29 08:53:31 +0000 2009" => "Wed, Apr 29 2009 08:53:31 +0000"
+ return Date.parse(date_str.replace(/^([a-z]{3})( [a-z]{3} \d\d?)(.*)( \d{4})$/i, '$1,$2$4$3'));
+ }
- function build_api_request() {
- var modpath = s.modpath,
- count = (s.fetch === null) ? s.count : s.fetch,
- defaults = {
- include_entities: 1
- };
+ 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 < 1) {
+ r = 'just now';
+ } else if (delta < 60) {
+ r = delta + ' seconds ago';
+ } else if(delta < 120) {
+ r = 'about a minute ago';
+ } else if(delta < (45*60)) {
+ r = 'about ' + (parseInt(delta / 60, 10)).toString() + ' minutes ago';
+ } else if(delta < (2*60*60)) {
+ r = 'about an hour ago';
+ } else if(delta < (24*60*60)) {
+ r = 'about ' + (parseInt(delta / 3600, 10)).toString() + ' hours ago';
+ } else if(delta < (48*60*60)) {
+ r = 'about a day ago';
+ } else {
+ r = 'about ' + (parseInt(delta / 86400, 10)).toString() + ' days ago';
+ }
+ return r;
+ }
- if (s.list) {
- return {
- host: s.twitter_api_url,
- url: "/1.1/lists/statuses.json",
- parameters: $.extend({}, defaults, {
- list_id: s.list_id,
- slug: s.list,
- owner_screen_name: s.username,
- page: s.page,
- count: count,
- include_rts: (s.retweets ? 1 : 0)
- })
- };
- } else if (s.favorites) {
- return {
- host: s.twitter_api_url,
- url: "/1.1/favorites/list.json",
- parameters: $.extend({}, defaults, {
- list_id: s.list_id,
- screen_name: s.username,
- page: s.page,
- count: count
- })
- };
- } else if (s.query === null && s.username.length === 1) {
- return {
- host: s.twitter_api_url,
- url: "/1.1/statuses/user_timeline.json",
- parameters: $.extend({}, defaults, {
- screen_name: s.username,
- page: s.page,
- count: count,
- include_rts: (s.retweets ? 1 : 0)
- })
- };
- } else {
- var query = (s.query || 'from:'+s.username.join(' OR from:'));
- return {
- host: s.twitter_search_url,
- url: "/1.1/search/tweets.json",
- parameters: $.extend({}, defaults, {
- q: query,
- count: count
- })
- };
- }
- }
+ function build_auto_join_text(text) {
+ if (text.match(/^(@([A-Za-z0-9-_]+)) .*/i)) {
+ return s.auto_join_text_reply;
+ } else if (text.match(url_regexp)) {
+ return s.auto_join_text_url;
+ } else if (text.match(/^((\w+ed)|just) .*/im)) {
+ return s.auto_join_text_ed;
+ } else if (text.match(/^(\w*ing) .*/i)) {
+ return s.auto_join_text_ing;
+ } else {
+ return s.auto_join_text_default;
+ }
+ }
- function extract_avatar_url(item, secure) {
- if (secure) {
- return ('user' in item) ?
- item.user.profile_image_url_https :
- 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;
- }
- }
+ function build_api_request() {
+ var modpath = s.modpath,
+ count = (s.fetch === null) ? s.count : s.fetch,
+ defaults = {
+ include_entities: 1
+ };
- // Convert twitter API objects into data available for
- // constructing each tweet using a template
- function extract_template_data(item) {
- var o = {};
- o.item = item;
- o.source = item.source;
- // 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.screen_name = item.from_user || item.user.screen_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';
- o.tweet_time = parse_date(item.created_at);
- o.join_text = s.join_text == "auto" ? build_auto_join_text(item.text) : s.join_text;
- o.tweet_id = item.id_str;
- o.twitter_base = "http://"+s.twitter_url+"/";
- o.user_url = o.twitter_base+o.screen_name;
- o.tweet_url = o.user_url+"/status/"+o.tweet_id;
- o.reply_url = o.twitter_base+"intent/tweet?in_reply_to="+o.tweet_id;
- 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.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 = $([linkURLs(o.tweet_raw_text, o.entities)]).linkUser().linkHash()[0];
- o.tweet_text_fancy = $([o.tweet_text]).makeHeart()[0];
+ if (s.list) {
+ return {
+ host: s.twitter_api_url,
+ url: "/1.1/lists/statuses.json",
+ parameters: $.extend({}, defaults, {
+ list_id: s.list_id,
+ slug: s.list,
+ owner_screen_name: s.username,
+ page: s.page,
+ count: count,
+ include_rts: (s.retweets ? 1 : 0)
+ })
+ };
+ } else if (s.favorites) {
+ return {
+ host: s.twitter_api_url,
+ url: "/1.1/favorites/list.json",
+ parameters: $.extend({}, defaults, {
+ list_id: s.list_id,
+ screen_name: s.username,
+ page: s.page,
+ count: count
+ })
+ };
+ } else if (s.query === null && s.username.length === 1) {
+ return {
+ host: s.twitter_api_url,
+ url: "/1.1/statuses/user_timeline.json",
+ parameters: $.extend({}, defaults, {
+ screen_name: s.username,
+ page: s.page,
+ count: count,
+ include_rts: (s.retweets ? 1 : 0)
+ })
+ };
+ } else {
+ var query = (s.query || 'from:'+s.username.join(' OR from:'));
+ return {
+ host: s.twitter_search_url,
+ url: "/1.1/search/tweets.json",
+ parameters: $.extend({}, defaults, {
+ q: query,
+ count: count
+ })
+ };
+ }
+ }
- // Default spans, and pre-formatted blocks for common layouts
- o.user = t('', o);
- o.join = s.join_text ? t(' ', o) : ' ';
- o.avatar = o.avatar_size ?
- t('', o) : '';
- o.time = t('', o);
- o.text = t('', o);
- o.reply_action = t('', o);
- o.retweet_action = t('', o);
- o.favorite_action = t('', o);
- return o;
- }
+ function extract_avatar_url(item, secure) {
+ if (secure) {
+ return ('user' in item) ?
+ item.user.profile_image_url_https :
+ 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;
+ }
+ }
- return this.each(function(i, widget){
- var list = $('