mirror/spacedeck-open
1
0
Fork 0
mirror of https://github.com/spacedeck/spacedeck-open.git synced 2025-12-15 17:37:30 +01:00
Code Issues Projects Releases Wiki Activity

space: fix realtime artifact media conversion feedback for video, audio

Browse Source
This commit is contained in:
mntmn
2020-11-21 16:38:17 +01:00
parent 89f48e615f
commit 9a1e85fb94
8 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/javascripts/spacedeck_sections.js
View File

@@ -1602,12 +1602,8 @@ var SpacedeckSections = {
if (this.guest_nickname) {
new_item.editor_name = this.guest_nickname;
}
// console.log("new artifact", new_item);
save_artifact(new_item, function(saved_item) {
// console.log("saved artifact", saved_item);
this.update_board_artifact_viewmodel(saved_item);
this.active_space_artifacts.push(saved_item);

16
public/javascripts/spacedeck_websockets.js
View File

@@ -40,7 +40,11 @@ SpacedeckWebsockets = {
}
} else console.log("artifact created in another space.");
}
else if (msg.action == "update" && msg.object) {
else if ((msg.action == "update" || msg.action == "update-self") && msg.object) {
if (msg.action == "update-self") {
console.log(msg.object);
}
if (this.active_space) {
var o = msg.object;
if (o && o._id) {
@@ -185,7 +189,7 @@ SpacedeckWebsockets = {
return;
}
if (msg.channel_id == channel_id) {
if (msg.channel_id == channel_id && !msg.action.match("-self")) {
return;
}
@@ -199,7 +203,7 @@ SpacedeckWebsockets = {
this.handle_presenter_media_update(msg);
}
if (msg.action == "update" || msg.action == "create" || msg.action == "delete"){
if (msg.action == "update" || msg.action == "update-self" || msg.action == "create" || msg.action == "delete") {
this.handle_live_updates(msg);
}
@@ -232,13 +236,13 @@ SpacedeckWebsockets = {
return (u && (u._id != this.user._id));
}.bind(this));
}
users = _.filter(users, function(u) {
return (u && (u._id || u.nickname));
});
this.users_online[spaceId] = users;
if (this.active_space) {
if (this.active_space._id == spaceId) {
this.active_space_users = users;

3
public/stylesheets/style.css
View File

@@ -15350,7 +15350,8 @@ body:not(.present-mode) #space .artifact.selected {
padding: 10px;
background-color: #3d9ee9;
opacity: 0.9;
text-align: center; }
text-align: center;
font-size: 14px; }
.artifact.state-processing .progress-text, .artifact.state-uploading .progress-text {
text-align: center;
padding: 8px;