tesses50
/
freetube
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/FreeTubeApp/FreeTube-Vue 

Merge with Watch.Js
This commit is contained in:
Luca 2020-08-13 23:24:10 +02:00
parent a25ae08b80 306335ab16
commit 07db5c5759
2 changed files with 345 additions and 340 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

673
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

12
src/renderer/views/Channel/Channel.js
View File

@ -1,4 +1,5 @@
import Vue from 'vue' import Vue from 'vue'
import { mapActions } from 'vuex'
import FtCard from '../../components/ft-card/ft-card.vue' import FtCard from '../../components/ft-card/ft-card.vue'
import FtButton from '../../components/ft-button/ft-button.vue' import FtButton from '../../components/ft-button/ft-button.vue'
import FtInput from '../../components/ft-input/ft-input.vue' import FtInput from '../../components/ft-input/ft-input.vue'
@ -9,6 +10,7 @@ import FtLoader from '../../components/ft-loader/ft-loader.vue'
import FtElementList from '../../components/ft-element-list/ft-element-list.vue' import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
import ytch from 'yt-channel-info' import ytch from 'yt-channel-info'
import autolinker from 'autolinker'
export default Vue.extend({ export default Vue.extend({
name: 'Search', name: 'Search',
@ -179,7 +181,7 @@ export default Vue.extend({
this.channelName = response.author this.channelName = response.author
this.subCount = response.subscriberCount this.subCount = response.subscriberCount
this.thumbnailUrl = response.authorThumbnails[2].url this.thumbnailUrl = response.authorThumbnails[2].url
this.channelDescription = response.description this.channelDescription = autolinker.link(response.description)
this.relatedChannels = response.relatedChannels this.relatedChannels = response.relatedChannels
if (response.authorBanners !== null) { if (response.authorBanners !== null) {
@ -270,7 +272,7 @@ export default Vue.extend({
this.id = response.authorId this.id = response.authorId
this.subCount = response.subCount this.subCount = response.subCount
this.thumbnailUrl = response.authorThumbnails[3].url this.thumbnailUrl = response.authorThumbnails[3].url
this.channelDescription = response.description this.channelDescription = autolinker.link(response.description)
this.relatedChannels = response.relatedChannels this.relatedChannels = response.relatedChannels
this.latestVideos = response.latestVideos this.latestVideos = response.latestVideos
@ -544,6 +546,10 @@ export default Vue.extend({
this.isLoading = false this.isLoading = false
} }
}) })
} },
...mapActions([
'showToast'
])
} }
}) })