NextCloud
/
spacedeck-open
mirror of https://github.com/spacedeck/spacedeck-open
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'mnt' of https://github.com/spacedeck/spacedeck-open into mnt

pull/189/head
dm 2021-02-14 12:55:58 +01:00
parent 0e2c6401e0 20bbb5aa08
commit 7c8ef82bd1
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/artifact_converter.js
View File

@ -171,7 +171,7 @@ function convertVideo(fileName, filePath, codec, callback, progressCallback) {
ff.stderr.on('data', function (data) {
console.log('[ffmpeg-video] stderr: ' + data);
if (progressCallback) {
progressCallback(getConversionProgress(""+data));
progressCallback(getConversionProgress(""+data)+"%");
}
});

4
views/partials/space.html
View File

@ -156,10 +156,10 @@
<source v-for="rep in a.view.payload_alternatives" v-bind:src="rep.payload_uri" v-bind:type="rep.mime" />
<source v-if="a.view.payload_uri && a.view.mime" v-bind:src="a.view.payload_uri" v-bind:type="a.view.mime" />
</video>
<div class="progress" v-bind:style="{width: a.description+'%'}">
<div class="progress" v-bind:style="{width: a.description}">
<div class="progress-container">
<h3>
{{a.description}}%
{{a.description}}
</h3>
</div>
</div>