From e55f6cc4fd61f3b85c42f3de5b88da5094fe82f4 Mon Sep 17 00:00:00 2001
From: Peter Deltchev <peter@deltchev.com>
Date: Sat, 24 Oct 2015 02:18:01 -0700
Subject: [PATCH] Fixed an erroneous "null" HTTP request and made a link to
 Poniverse.net open in a new tab.

---
 public/templates/albums/list.html                 |  2 +-
 public/templates/partials/credits-dialog.html     |  2 +-
 .../scripts/app/controllers/account-track.coffee  |  1 -
 .../scripts/app/directives/src-loader.coffee      | 15 +++++++++------
 .../assets/scripts/base/soundmanager2-nodebug.js  |  2 +-
 5 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/public/templates/albums/list.html b/public/templates/albums/list.html
index ac1fb334..934297d0 100644
--- a/public/templates/albums/list.html
+++ b/public/templates/albums/list.html
@@ -1,3 +1,3 @@
 <div class="stretch-to-bottom">
 	<pfm-albums-list albums="albums"></pfm-albums-list>
-</div>
\ No newline at end of file
+</div>
diff --git a/public/templates/partials/credits-dialog.html b/public/templates/partials/credits-dialog.html
index 3c6ad2e4..16723161 100644
--- a/public/templates/partials/credits-dialog.html
+++ b/public/templates/partials/credits-dialog.html
@@ -6,7 +6,7 @@
 </div>
 <div class="modal-body">
   <p>Pony.fm was created to organize the <em>My Little Pony</em> community&#39;s fan music.
-  The project is maintained by <a href="https://poniverse.net/">Poniverse</a>, an
+  The project is maintained by <a href="https://poniverse.net/" target="_blank">Poniverse</a>, an
     organization devoted to building and operating fan sites for the pony community.</p>
 
 	<h2>Open-source credits</h2>
diff --git a/resources/assets/scripts/app/controllers/account-track.coffee b/resources/assets/scripts/app/controllers/account-track.coffee
index d0065d82..1e3c3f7c 100644
--- a/resources/assets/scripts/app/controllers/account-track.coffee
+++ b/resources/assets/scripts/app/controllers/account-track.coffee
@@ -105,7 +105,6 @@ angular.module('ponyfm').controller "account-track", [
 			xhr.send formData
 
 		tracks.getEdit($state.params.track_id).done (track) ->
-			console.log (track.album_id);
 			$scope.edit =
 				id: track.id
 				title: track.title
diff --git a/resources/assets/scripts/app/directives/src-loader.coffee b/resources/assets/scripts/app/directives/src-loader.coffee
index b244f90d..ebcd595a 100644
--- a/resources/assets/scripts/app/directives/src-loader.coffee
+++ b/resources/assets/scripts/app/directives/src-loader.coffee
@@ -10,13 +10,16 @@ angular.module('ponyfm').directive 'pfmSrcLoader', () ->
 			image.removeAttr 'pfm-src-loader'
 			image.removeAttr 'pfm-src-size'
 
-			image[0].onload = ->
-				element.attr 'src', val
-				element.css {opacity: 0}
-				element.animate {opacity: 1}, 250
+			# If the given value is null, don't bother trying to
+			# load something - it will result in an HTTP error.
+			if val
+				image[0].onload = ->
+					element.attr 'src', val
+					element.css {opacity: 0}
+					element.animate {opacity: 1}, 250
 
-			image[0].src = val
+				image[0].src = val
 
 		update scope.$eval attrs.pfmSrcLoader
 
-		scope.$watch attrs.pfmSrcLoader, update
\ No newline at end of file
+		scope.$watch attrs.pfmSrcLoader, update
diff --git a/resources/assets/scripts/base/soundmanager2-nodebug.js b/resources/assets/scripts/base/soundmanager2-nodebug.js
index 8d7c2472..8c5403ab 100644
--- a/resources/assets/scripts/base/soundmanager2-nodebug.js
+++ b/resources/assets/scripts/base/soundmanager2-nodebug.js
@@ -2640,4 +2640,4 @@ if (window.SM2_DEFER === undefined || !SM2_DEFER) {
 }
 window.SoundManager = SoundManager;
 window.soundManager = soundManager;
-}(window));
\ No newline at end of file
+}(window));