Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

various improvements #1601

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 11 additions & 9 deletions src/components/modals/AddPreviewModal.vue
Original file line number Diff line number Diff line change
Expand Up @@ -289,17 +289,19 @@ export default {
handler() {
this.$nextTick(() => {
this.isWrongDuration = false
Object.keys(this.$refs).forEach(key => {
const ref = this.$refs[key]
if (key.startsWith('video-') && ref[0]) {
ref[0].onloadedmetadata = () => {
const frames = Math.round(ref[0].duration * this.fps) - 1
if (frames !== this.expectedFrames) {
this.isWrongDuration = true
if (this.expectedFrames !== 0) {
Object.keys(this.$refs).forEach(key => {
const ref = this.$refs[key]
if (key.startsWith('video-') && ref[0]) {
ref[0].onloadedmetadata = () => {
const frames = Math.round(ref[0].duration * this.fps)
if (frames !== this.expectedFrames) {
this.isWrongDuration = true
}
}
}
}
})
})
}
})
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -1419,7 +1419,7 @@ export default {
sequences: 'Sequences',
tasks: 'Shot Tasks',
title: 'Shots',
wrong_file_duration: 'One of the upldoaded video file duration doesn\'t match the expected duration of the current shot.',
wrong_file_duration: 'One of the uploaded video file duration doesn\'t match the expected duration of the current shot.',
fields: {
description: 'Description',
nb_frames: 'Frames',
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en_nft.js
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export default {
restore_error: 'An error occurred while restoring this NFT.',
tasks: 'NFT Tasks',
title: 'NFT Collection',
wrong_file_duration: 'One of the upldoaded video file duration doesn\'t match the expected duration of the current NFT.',
wrong_file_duration: 'One of the uploaded video file duration doesn\'t match the expected duration of the current NFT.',
fields: {
placeholder: "NFT01"
}
Expand Down
2 changes: 1 addition & 1 deletion src/locales/en_video-game.js
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ export default {
sequences: 'Levels',
tasks: 'Map Tasks',
title: 'Maps',
wrong_file_duration: 'One of the upldoaded video file duration doesn\'t match the expected duration of the current map.',
wrong_file_duration: 'One of the uploaded video file duration doesn\'t match the expected duration of the current map.',
fields: {
episode: 'Chapter',
placeholder: 'MP01',
Expand Down
2 changes: 1 addition & 1 deletion src/store/api/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ const client = {
},

getEvents(after, before) {
const path = `/api/data/events/last?after=${after}&before=${before}&page_size=100000`
const path = `/api/data/events/last?after=${after}&before=${before}&limit=100000`
return client.pget(path)
},

Expand Down
Loading