Merge pull request #85 from GawainLynch/master

Add Twitter timeline
tmort · Dec 24, 2014 · 1f596a5 · 1f596a5
2 parents 9e15dfa + e17987e
commit 1f596a5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/extensions/socialite.twitter.js b/extensions/socialite.twitter.js
@@ -61,10 +61,11 @@
         }
     };
 
-    Socialite.widget('twitter', 'share',   { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'follow',  { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'hashtag', { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'mention', { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'share',    { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'follow',   { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'hashtag',  { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'mention',  { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'timeline', { init: twitterInit, activate: twitterActivate });
 
     Socialite.widget('twitter', 'embed',   {
         process: function(instance)

diff --git a/socialite.js b/socialite.js
@@ -588,10 +588,11 @@ window.Socialite = (function(window, document, undefined)
         }
     };
 
-    Socialite.widget('twitter', 'share',   { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'follow',  { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'hashtag', { init: twitterInit, activate: twitterActivate });
-    Socialite.widget('twitter', 'mention', { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'share',    { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'follow',   { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'hashtag',  { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'mention',  { init: twitterInit, activate: twitterActivate });
+    Socialite.widget('twitter', 'timeline', { init: twitterInit, activate: twitterActivate });
 
     Socialite.widget('twitter', 'embed', {
         process: function(instance)