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

Merge branch 'feature/mlpma-classifier'

Browse source
This commit is contained in:
Josef Citrine 2016-08-29 00:12:12 +01:00
commit 727a83d95b
5 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
package.json
View file

@ -9,10 +9,10 @@
"packages": {},
"dependencies": {},
"devDependencies": {
"angular": "1.5.6",
"angular": "1.5.8",
"angular-chart.js": "1.0.0-alpha6",
"angular-strap": "2.3.8",
"angular-ui-router": "0.2.18",
"angular-ui-router": "0.3.1",
"chart.js": "2.1.0",
"coffee-loader": "0.7.2",
"coffee-script": "1.10.0",
@ -31,8 +31,7 @@
"gulp-plumber": "1.1.0",
"gulp-sourcemaps": "1.6.0",
"gulp-util": "3.0.7",
"jquery": "2.2.0",
"jquery-ui": "1.10.5",
"jquery": "2.2.4",
"script-loader": "0.7.0",
"underscore": "1.8.3",
"webpack": "1.13.1",

4
resources/assets/scripts/app/app.coffee
View file

@ -279,12 +279,12 @@ ponyfm.config [
templateUrl: '/templates/admin/show-songs.html'
state.state 'admin.tracks',
url: '/tracks'
url: '/tracks?filter&page'
controller: 'admin-tracks'
templateUrl: '/templates/admin/tracks.html'
state.state 'admin.classifier',
url: '/tracks/unclassified'
url: '/tracks/unclassified?filter&page'
controller: 'admin-classifier'
templateUrl: '/templates/admin/classifier.html'

2
resources/assets/scripts/app/controllers/admin-classifier.coffee
View file

@ -21,6 +21,7 @@ window.pfm.preloaders['admin-classifier'] = [
tracks.mainQuery.fromFilterString($state.params.filter)
tracks.mainQuery.setPage $state.params.page || 1
tracks.mainQuery.setAdmin true
tracks.mainQuery.fetch(tracks.FetchType.UNCLASSIFIED)
)
]
@ -28,5 +29,4 @@ module.exports = angular.module('ponyfm').controller "admin-classifier", [
'$scope', 'tracks', '$state',
($scope, tracks, $state) ->
]

3
resources/assets/scripts/app/controllers/admin-tracks.coffee
View file

@ -21,12 +21,11 @@ window.pfm.preloaders['admin-tracks'] = [
tracks.mainQuery.fromFilterString($state.params.filter)
tracks.mainQuery.setPage $state.params.page || 1
tracks.mainQuery.setAdmin true
tracks.mainQuery.fetch(tracks.FetchType.ALL)
)
]
module.exports = angular.module('ponyfm').controller "admin-tracks", [
'$scope', 'tracks', '$state',
($scope, tracks, $state) ->
]

7
resources/assets/scripts/app/directives/paged-tracks-list.coffee
View file

@ -23,8 +23,8 @@ module.exports = angular.module('ponyfm').directive 'pfmPagedTracksList', () ->
class: '@class'
controller: [
'$scope', 'tracks', '$state',
($scope, tracks, $state) ->
'$scope', 'tracks', '$state', '$location'
($scope, tracks, $state, $location) ->
typeEnum = switch
when $scope.type == 'normal' then tracks.FetchType.NORMAL
when $scope.type == 'all' then tracks.FetchType.ALL
@ -61,7 +61,8 @@ module.exports = angular.module('ponyfm').directive 'pfmPagedTracksList', () ->
$scope.pageSelectorShown = false
$scope.gotoPage = (page) ->
$state.transitionTo $state.current.name, {filter: $state.params.filter, page: page}
#$scope.$emit 'pageChange', {filter: $state.params.filter, page: page}
$state.go '.', {filter: $state.params.filter, page: page}
$scope.showPageSelector = () ->
$scope.pageSelectorShown = true