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

This commit is contained in:
Preston 2020-08-26 16:45:57 -04:00
commit 472844371e
5 changed files with 18 additions and 3 deletions

View File

@ -8,6 +8,7 @@
appearance="result"
:data="result"
:first-screen="index < 16"
:layout="listType"
/>
</ft-auto-grid>
</template>

View File

@ -1,3 +1,7 @@
.lazyWrapper {
.grid {
min-height: 264px;
}
.list {
min-height: 131px;
}

View File

@ -22,6 +22,10 @@ export default Vue.extend({
firstScreen: {
type: Boolean,
required: true
},
layout: {
type: String,
default: 'grid'
}
},
data: function () {

View File

@ -4,7 +4,10 @@
callback: onVisibilityChanged,
once: true,
}"
class="lazyWrapper"
:class="{
grid: layout === 'grid',
list: layout === 'list'
}"
>
<ft-list-channel
v-if="data.type === 'channel' && visible"

View File

@ -653,11 +653,14 @@ export default Vue.extend({
if (this.isDev) {
fileLocation = `storyboards/${this.videoId}.vtt`
uriSchema = fileLocation
// if the location does not exist, writeFileSync will not create the directory, so we have to do that manually
if (!fs.existsSync('storyboards/')) {
fs.mkdirSync('storyboards/')
}
} else {
fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
uriSchema = `file://${fileLocation}`
}
fs.writeFileSync(fileLocation, results)
this.videoStoryboardSrc = uriSchema