mirror of
https://github.com/Poniverse/Pony.fm.git
synced 2024-11-22 04:58:01 +01:00
Attempting (and failing) to fix pagination
This commit is contained in:
parent
bdbaca7a19
commit
bce22d6877
1 changed files with 9 additions and 3 deletions
|
@ -23,8 +23,8 @@ module.exports = angular.module('ponyfm').directive 'pfmPagedTracksList', () ->
|
||||||
class: '@class'
|
class: '@class'
|
||||||
|
|
||||||
controller: [
|
controller: [
|
||||||
'$scope', 'tracks', '$state',
|
'$scope', 'tracks', '$state', '$location'
|
||||||
($scope, tracks, $state) ->
|
($scope, tracks, $state, $location) ->
|
||||||
typeEnum = switch
|
typeEnum = switch
|
||||||
when $scope.type == 'normal' then tracks.FetchType.NORMAL
|
when $scope.type == 'normal' then tracks.FetchType.NORMAL
|
||||||
when $scope.type == 'all' then tracks.FetchType.ALL
|
when $scope.type == 'all' then tracks.FetchType.ALL
|
||||||
|
@ -58,10 +58,16 @@ module.exports = angular.module('ponyfm').directive 'pfmPagedTracksList', () ->
|
||||||
# The actual last page will always be in the paginator.
|
# The actual last page will always be in the paginator.
|
||||||
$scope.pages.push($scope.totalPages) unless $scope.totalPages in $scope.pages
|
$scope.pages.push($scope.totalPages) unless $scope.totalPages in $scope.pages
|
||||||
|
|
||||||
|
console.log $state
|
||||||
|
|
||||||
$scope.pageSelectorShown = false
|
$scope.pageSelectorShown = false
|
||||||
|
|
||||||
$scope.gotoPage = (page) ->
|
$scope.gotoPage = (page) ->
|
||||||
$state.transitionTo $state.current.name, {filter: $state.params.filter, page: page}
|
#$state.transitionTo $state.current.name, {filter: $state.params.filter, page: page}
|
||||||
|
#$location.search 'filter', $state.params.filter
|
||||||
|
#$location.search 'page', page
|
||||||
|
tracks.mainQuery.fromFilterString($state.params.filter)
|
||||||
|
tracks.mainQuery.setPage page || 1
|
||||||
|
|
||||||
$scope.showPageSelector = () ->
|
$scope.showPageSelector = () ->
|
||||||
$scope.pageSelectorShown = true
|
$scope.pageSelectorShown = true
|
||||||
|
|
Loading…
Reference in a new issue