Fixed an erroneous "null" HTTP request and made a link to Poniverse.net open in a new tab.

This commit is contained in:
Peter Deltchev 2015-10-24 02:18:01 -07:00
parent dc7c2786a8
commit e55f6cc4fd
5 changed files with 12 additions and 10 deletions

View file

@ -1,3 +1,3 @@
<div class="stretch-to-bottom"> <div class="stretch-to-bottom">
<pfm-albums-list albums="albums"></pfm-albums-list> <pfm-albums-list albums="albums"></pfm-albums-list>
</div> </div>

View file

@ -6,7 +6,7 @@
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p>Pony.fm was created to organize the <em>My Little Pony</em> community&#39;s fan music. <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> organization devoted to building and operating fan sites for the pony community.</p>
<h2>Open-source credits</h2> <h2>Open-source credits</h2>

View file

@ -105,7 +105,6 @@ angular.module('ponyfm').controller "account-track", [
xhr.send formData xhr.send formData
tracks.getEdit($state.params.track_id).done (track) -> tracks.getEdit($state.params.track_id).done (track) ->
console.log (track.album_id);
$scope.edit = $scope.edit =
id: track.id id: track.id
title: track.title title: track.title

View file

@ -10,13 +10,16 @@ angular.module('ponyfm').directive 'pfmSrcLoader', () ->
image.removeAttr 'pfm-src-loader' image.removeAttr 'pfm-src-loader'
image.removeAttr 'pfm-src-size' image.removeAttr 'pfm-src-size'
image[0].onload = -> # If the given value is null, don't bother trying to
element.attr 'src', val # load something - it will result in an HTTP error.
element.css {opacity: 0} if val
element.animate {opacity: 1}, 250 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 update scope.$eval attrs.pfmSrcLoader
scope.$watch attrs.pfmSrcLoader, update scope.$watch attrs.pfmSrcLoader, update

View file

@ -2640,4 +2640,4 @@ if (window.SM2_DEFER === undefined || !SM2_DEFER) {
} }
window.SoundManager = SoundManager; window.SoundManager = SoundManager;
window.soundManager = soundManager; window.soundManager = soundManager;
}(window)); }(window));