MirrorMirror
/
funkwhale
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'i18n-views-playlists' into 'develop' 

I18n views playlists

See merge request funkwhale/funkwhale!140
This commit is contained in:
Eliot Berriot 2018-04-18 17:01:11 +00:00
parent e00b5293c1 0213ec6d02
commit 89d8826369
3 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
front/src/components/Sidebar.vue
View File

@ -159,7 +159,6 @@ export default {
// for half the height of the containers display area // for half the height of the containers display area
var scrollBack = (container.scrollHeight - container.scrollTop <= container.clientHeight) ? 0 : container.clientHeight / 2 var scrollBack = (container.scrollHeight - container.scrollTop <= container.clientHeight) ? 0 : container.clientHeight / 2
container.scrollTop = container.scrollTop - scrollBack container.scrollTop = container.scrollTop - scrollBack
console.log(container.scrollHeight - container.scrollTop, container.clientHeight)
} }
}, },
watch: { watch: {

2
front/src/main.js
View File

@ -35,7 +35,7 @@ Vue.use(VueMasonryPlugin)
Vue.use(VueLazyload) Vue.use(VueLazyload)
Vue.config.productionTip = false Vue.config.productionTip = false
Vue.directive('title', { Vue.directive('title', {
inserted: (el, binding) => { console.log(binding.value); document.title = binding.value + ' - Funkwhale' }, inserted: (el, binding) => { document.title = binding.value + ' - Funkwhale' },
updated: (el, binding) => { document.title = binding.value + ' - Funkwhale' } updated: (el, binding) => { document.title = binding.value + ' - Funkwhale' }
}) })

1
front/src/views/radios/Detail.vue
View File

@ -83,7 +83,6 @@ export default {
axios.get(url).then((response) => { axios.get(url).then((response) => {
self.radio = response.data self.radio = response.data
axios.get(url + 'tracks', {params: {page: this.page}}).then((response) => { axios.get(url + 'tracks', {params: {page: this.page}}).then((response) => {
console.log(response.data.count)
this.totalTracks = response.data.count this.totalTracks = response.data.count
this.tracks = response.data.results this.tracks = response.data.results
}).then(() => { }).then(() => {