Merge branch 'master' of github.com:FreeTubeApp/FreeTube-Vue
This commit is contained in:
commit
472844371e
|
@ -8,6 +8,7 @@
|
||||||
appearance="result"
|
appearance="result"
|
||||||
:data="result"
|
:data="result"
|
||||||
:first-screen="index < 16"
|
:first-screen="index < 16"
|
||||||
|
:layout="listType"
|
||||||
/>
|
/>
|
||||||
</ft-auto-grid>
|
</ft-auto-grid>
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
.lazyWrapper {
|
.grid {
|
||||||
min-height: 264px;
|
min-height: 264px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.list {
|
||||||
|
min-height: 131px;
|
||||||
|
}
|
||||||
|
|
|
@ -22,6 +22,10 @@ export default Vue.extend({
|
||||||
firstScreen: {
|
firstScreen: {
|
||||||
type: Boolean,
|
type: Boolean,
|
||||||
required: true
|
required: true
|
||||||
|
},
|
||||||
|
layout: {
|
||||||
|
type: String,
|
||||||
|
default: 'grid'
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
data: function () {
|
data: function () {
|
||||||
|
|
|
@ -4,7 +4,10 @@
|
||||||
callback: onVisibilityChanged,
|
callback: onVisibilityChanged,
|
||||||
once: true,
|
once: true,
|
||||||
}"
|
}"
|
||||||
class="lazyWrapper"
|
:class="{
|
||||||
|
grid: layout === 'grid',
|
||||||
|
list: layout === 'list'
|
||||||
|
}"
|
||||||
>
|
>
|
||||||
<ft-list-channel
|
<ft-list-channel
|
||||||
v-if="data.type === 'channel' && visible"
|
v-if="data.type === 'channel' && visible"
|
||||||
|
|
|
@ -653,11 +653,14 @@ export default Vue.extend({
|
||||||
if (this.isDev) {
|
if (this.isDev) {
|
||||||
fileLocation = `storyboards/${this.videoId}.vtt`
|
fileLocation = `storyboards/${this.videoId}.vtt`
|
||||||
uriSchema = fileLocation
|
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 {
|
} else {
|
||||||
fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
|
fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
|
||||||
uriSchema = `file://${fileLocation}`
|
uriSchema = `file://${fileLocation}`
|
||||||
}
|
}
|
||||||
|
|
||||||
fs.writeFileSync(fileLocation, results)
|
fs.writeFileSync(fileLocation, results)
|
||||||
|
|
||||||
this.videoStoryboardSrc = uriSchema
|
this.videoStoryboardSrc = uriSchema
|
||||||
|
|
Loading…
Reference in New Issue