Merge branch 'master' of github.com:mustardhamsters/reddit.tv

Conflicts: js/tv.js
reddit-archive · Dec 17, 2013 · 195caee · 195caee
2 parents ebdcce7 + 0259b73
commit 195caee
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/index.php b/index.php
@@ -176,7 +176,7 @@
 
   <footer>
     <div class="grid-container">
-      Privacy Policy, etc <?php /* TODO Include privacy policy and copyright jams, Twitter attribution for Bootstrap */ ?>
+      Use of this site constitutes acceptance of our <a href="http://www.reddit.com/help/useragreement">User Agreement (updated)</a> and <a href="http://www.reddit.com/help/privacypolicy">Privacy Policy</a>. © 2013 reddit Inc. All rights reserved.
     </div>
   </footer>
 

diff --git a/js/tv.js b/js/tv.js
@@ -1324,6 +1324,9 @@ var RedditTV = Class.extend({
 
 			var redditlink = 'http://reddit.com'+$.unescapifyHTML(video.permalink);
 
+			self.gaEventTrack('Video', 'Play', self.curVideoTitle());
+			self.gaEventTrack('Channel', 'Video Play', self.curVideoTitle());
+
 			var videoTitle = '<a href="' + redditlink + '" target="_blank"'
 									+ ' title="' + video.title_quot + '">'
 									+ video.title_unesc + '</a>';