Skip to content
Snippets Groups Projects
Commit 89d88263 authored by Eliot Berriot's avatar Eliot Berriot
Browse files

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

I18n views playlists

See merge request funkwhale/funkwhale!140
parents e00b5293 0213ec6d
No related branches found
No related tags found
No related merge requests found
...@@ -159,7 +159,6 @@ export default { ...@@ -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: {
......
...@@ -35,7 +35,7 @@ Vue.use(VueMasonryPlugin) ...@@ -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' }
}) })
......
...@@ -83,7 +83,6 @@ export default { ...@@ -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(() => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment