ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

video delete remove UI elements fix

montage-api
Moe 2021-12-05 12:23:51 -08:00
parent 2f89fc91cc
commit 5204df7a40
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/videos.js
View File

@ -237,7 +237,7 @@ module.exports = function(s,config,lang){
filename: filename, filename: filename,
mid: e.id, mid: e.id,
ke: e.ke, ke: e.ke,
time: s.nameToTime(filename), time: new Date(s.nameToTime(filename)),
end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss') end: s.formattedTime(new Date,'YYYY-MM-DD HH:mm:ss')
},'GRP_'+e.ke); },'GRP_'+e.ke);
var storageIndex = s.getVideoStorageIndex(e) var storageIndex = s.getVideoStorageIndex(e)

23
web/assets/js/bs5.videos.js
View File

@ -75,14 +75,14 @@ function createVideoRow(row,classOverride){
$.each(objectsFound,function(tag,count){ $.each(objectsFound,function(tag,count){
eventMatrixHtml += `<tr> eventMatrixHtml += `<tr>
<td class="${definitions.Theme.isDark ? 'text-white' : ''}" style="text-transform:capitalize">${tag}</td> <td class="${definitions.Theme.isDark ? 'text-white' : ''}" style="text-transform:capitalize">${tag}</td>
<td class="text-end"><span class="badge ${definitions.Theme.isDark ? 'bg-light text-dark' : 'bg-dark text-white'} rounded-pill">${count}</span></td> <td class="text-end"><span class="badge badge-dark text-white rounded-pill">${count}</span></td>
</tr>` </tr>`
}) })
eventMatrixHtml += `</table>` eventMatrixHtml += `</table>`
} }
var videoEndpoint = getLocation() + '/' + $user.auth_token + '/videos/' + $user.ke + '/' + row.mid + '/' + row.filename var videoEndpoint = getLocation() + '/' + $user.auth_token + '/videos/' + $user.ke + '/' + row.mid + '/' + row.filename
return ` return `
<div class="video-row ${classOverride ? classOverride : `col-md-12 col-lg-6 mb-3`} search-row" data-mid="${row.mid}" data-time="${row.time}"> <div class="video-row ${classOverride ? classOverride : `col-md-12 col-lg-6 mb-3`} search-row" data-mid="${row.mid}" data-time="${row.time}" data-time-formed="${new Date(row.time)}">
<div class="card shadow-lg px-0 btn-default"> <div class="card shadow-lg px-0 btn-default">
<div class="card-header d-flex flex-row"> <div class="card-header d-flex flex-row">
<div class="flex-grow-1 ${definitions.Theme.isDark ? 'text-white' : ''}"> <div class="flex-grow-1 ${definitions.Theme.isDark ? 'text-white' : ''}">
@ -181,6 +181,25 @@ function getEvents(options,callback){
callback(eventData) callback(eventData)
}) })
} }
onWebSocketEvent(function(d){
switch(d.f){
case'video_delete':
console.log(d)
$('[file="'+d.filename+'"][mid="'+d.mid+'"]:not(.modal)').remove();
$('[data-file="'+d.filename+'"][data-mid="'+d.mid+'"]:not(.modal)').remove();
$('[data-time-formed="'+(new Date(d.time))+'"][data-mid="'+d.mid+'"]:not(.modal)').remove();
// if($.powerVideoWindow.currentDataObject&&$.powerVideoWindow.currentDataObject[d.filename]){
// delete($.timelapse.currentVideos[$.powerVideoWindow.currentDataObject[d.filename].position])
// $.powerVideoWindow.drawTimeline(false)
// }
// if($.timelapse.currentVideos&&$.timelapse.currentVideos[d.filename]){
// delete($.timelapse.currentVideosArray.videos[$.timelapse.currentVideos[d.filename].position])
// $.timelapse.drawTimeline(false)
// }
// if($.vidview.loadedVideos && $.vidview.loadedVideos[d.filename])delete($.vidview.loadedVideos[d.filename])
break;
}
})
$(document).ready(function(){ $(document).ready(function(){
$('body') $('body')
.on('click','.open-video',function(){ .on('click','.open-video',function(){