Merged development into master

This commit is contained in:
NelsonLaQuet 2013-09-01 04:46:02 -05:00
commit 4c0fe00441

View file

@ -1,6 +1,6 @@
angular.module('ponyfm').factory('playlists', [ angular.module('ponyfm').factory('playlists', [
'$rootScope', '$state', '$http' '$rootScope', '$state', '$http', 'auth'
($rootScope, $state, $http) -> ($rootScope, $state, $http, auth) ->
playlistDef = null playlistDef = null
playlists = {} playlists = {}
playlistPages = [] playlistPages = []
@ -49,6 +49,7 @@ angular.module('ponyfm').factory('playlists', [
def def
refresh: () -> refresh: () ->
if auth.data.isLogged
$.getJSON('/api/web/playlists/pinned') $.getJSON('/api/web/playlists/pinned')
.done (playlists) -> $rootScope.$apply -> .done (playlists) -> $rootScope.$apply ->
self.pinnedPlaylists.length = 0 self.pinnedPlaylists.length = 0