Merge again

README.md

@@ -20,6 +20,7 @@ Tech
 - Stylus
 - Jade
 - SVG
+- Redbull
 
 API
 ====

private/styl/play.styl

@@ -103,9 +103,9 @@ body
     padding overlayPadding
     width 120px
   ul.friends
-    bottom 10px
+    bottom -20px
     width 100%
-    height 100px
+    height 80px
     text-align center
     .friend
       &:hover

public/js/play.js

@@ -25,10 +25,11 @@ $(function () {
   audioElem.addEventListener("timeupdate", function() { 
     var curTime = audioElem.currentTime;
     if (curTime >= starttimeoffset + duration) {
-      $(".photo").addClass("stopped");
+      // $(".photo").addClass("stopped");
       $(".progressjs-progress").hide();
       $('#animated-1').attr('dur', '50s');
       $('#animated-2').attr('dur', '30s');
+      $('.left.arrow').click();
       // audioElem.pause();
       playNext();
     }
@@ -63,7 +64,7 @@ $(function () {
         progressJs(".progress").set(0);
         $('#widget').attr('src', sound.stream_url + '?client_id=' + client_id);
         $('#song-title').html(sound.title);
-        $('#song-author').html('By <a target="_blank" href="' + sound.user.permalink_url + '">' + sound.user.username + '</a>');
+        // $('#song-author').html('By <a target="_blank" href="' + sound.user.permalink_url + '">' + sound.user.username + '</a>');
         if (sound.artwork_url) {
           var img = $('<img/>').attr('src', sound.artwork_url.replace("large", "crop"));
           img.addClass("current");
@@ -123,6 +124,11 @@ $(function () {
     });
   }
 
+  function loadFriendSong(clicked) {
+    var url = clicked.data('url');
+    playOne(url);
+  }
+
   ui.addBinds({
     onLeft : playNext,
     onRight : saveTrack,
@@ -131,7 +137,8 @@ $(function () {
       var url = clicked.data('url');
       playOne(url);
     },
-    onDropped : sendRecommendation
+    onDropped : sendRecommendation,
+    onAlbumClick : loadFriendSong
   });
 
   // on page load, get and play something

public/js/ui.js

@@ -51,7 +51,6 @@ function UIViewModel() {
 
 	var albumClick = function(clicked) {
 		for (var i = 0; i < bindings.onAlbumClick.length; i++) {
-			//console.log(typeof bindings.onRight[i]);
 			bindings.onAlbumClick[i](clicked);
 		}
 	};
@@ -164,8 +163,9 @@ function UIViewModel() {
 		toTrash();
 	});
 
-	$('.albumPhoto').click(function() {
-		albumClick($(this));
+	$('body').on('click', '.albumPhoto', function() {
+		if (dragging == null)
+			albumClick($(this));
 	});
 
 	$('.right.arrow').click(function () {