PonyMirrors/Pony.fm
1
0
Fork 0
mirror of https://github.com/Poniverse/Pony.fm.git synced 2024-11-22 13:07:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix for broken track formatting in HWC announcement

Browse source
This commit is contained in:
Josef Citrine 2016-12-29 00:14:52 +00:00
parent 7f566b266b
commit e30400cab0
3 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
public/templates/partials/announcements/hwc/winners.html
View file

@ -4,7 +4,7 @@
</div> </div>
<div class="announce-tracks"> <div class="announce-tracks">
<ul class="tracks-listing"> <ul class="tracks-listing">
<li ng-repeat="track in announcement.parsedTracks track by track.id" ng-class="{'can-favourite': auth.isLogged, 'is-favourited': auth.isLogged && track.user_data.is_favourited, 'is-playing': track.isPlaying, 'has-played': auth.isLogged && track.user_data.views}"> <li ng-repeat="track in announcement.parsedTracks track by track.place" ng-class="{'can-favourite': auth.isLogged, 'is-favourited': auth.isLogged && track.user_data.is_favourited, 'is-playing': track.isPlaying, 'has-played': auth.isLogged && track.user_data.views}">
<div class="image"> <div class="image">
<a href="#" class="play-button" pfm-eat-click ng-click="play(track)"> <a href="#" class="play-button" pfm-eat-click ng-click="play(track)">
<i class="fa fa-play" ng-if="!track.isPlaying"></i> <i class="fa fa-play" ng-if="!track.isPlaying"></i>

23
resources/assets/scripts/app/controllers/dashboard.coffee
View file

@ -39,10 +39,27 @@ module.exports = angular.module('ponyfm').controller "dashboard", [
if $scope.announcement.tracks.length > 0 if $scope.announcement.tracks.length > 0
console.log($scope.announcement.tracks) console.log($scope.announcement.tracks)
$scope.announcement.parsedTracks = [] $scope.announcement.parsedTracks = []
for track in $scope.announcement.tracks tempTracks = []
# Not the greatest, but sod it
for track, i in $scope.announcement.tracks
console.log(i)
tracks.fetch(track, false).done (trackResponse) -> tracks.fetch(track, false).done (trackResponse) ->
$scope.announcement.parsedTracks.push(trackResponse.track) theTrack = trackResponse.track
console.log(trackResponse) $scope.announcement.tracks.map((obj, index) ->
if obj == theTrack.id
theTrack.place = index
)
tempTracks.push(theTrack)
console.log(tempTracks)
if tempTracks.length == $scope.announcement.tracks.length
tempTracks.sort((a,b) ->
return a.place - b.place
)
$scope.announcement.parsedTracks = tempTracks
dashboard.refresh().done (res) -> dashboard.refresh().done (res) ->
$scope.recentTracks = res.recent_tracks $scope.recentTracks = res.recent_tracks

4
resources/assets/styles/dashboard.less vendored
View file

@ -238,11 +238,11 @@
} }
&:hover { &:hover {
background: rgba(0,0,0,0.2); background: rgba(0, 0, 0, 0.2);
} }
&.is-playing { &.is-playing {
background: rgba(0,0,0,0.1); background: rgba(0, 0, 0, 0.1);
} }
} }
} }