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

clean up region editor

email-send-options-from-account
Moe 2021-10-18 13:31:02 -07:00
parent c040812b88
commit aed3f5ee84
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
web/assets/js/bs5.regionEditor.js
View File

@ -45,7 +45,7 @@ $(document).ready(function(e){
var monitorDetails = Object.assign({},monitor.details)
var imageWidth = !isNaN(monitorDetails.detector_scale_x) ? parseInt(monitorDetails.detector_scale_x) : 640
var imageHeight = !isNaN(monitorDetails.detector_scale_y) ? parseInt(monitorDetails.detector_scale_y) : 480
monitorDetails.cords = monitorDetails.cords ? safeJsonParse(monitorDetails.cords) || [] : []
monitorDetails.cords = monitorDetails.cords ? safeJsonParse(monitorDetails.cords) || {} : {}
getRegionEditorCanvas()
.attr('width',imageWidth)
.attr('height',imageHeight);
@ -53,8 +53,7 @@ $(document).ready(function(e){
width: imageWidth,
height: imageHeight
});
monitorDetails.cords = safeJsonParse(monitorDetails.cords)
if(!monitorDetails.cords){
if(Object.keys(monitorDetails.cords).length === 0){
monitorDetails.cords = {}
monitorDetails.cords[generateId(5)] = createBlankCoorindateObject(lang['Region Name'])
}
@ -178,6 +177,10 @@ $(document).ready(function(e){
drawPointsTable()
}
}
function getRegionStillImageSwitch(){
var dashboardSwitches = dashboardOptions().switches || {}
return dashboardSwitches.regionStillImage || '0'
}
regionEditorRegionsList.change(function(e){
initCanvas();
})
@ -254,7 +257,7 @@ $(document).ready(function(e){
})
regionViewerDetails.cords = newCoordinates
regionViewerDetails.cords[randomId] = createBlankCoorindateObject(lang['Region Name'])
regionEditorRegionsList.append(`<option value="${randomId}">${randomId}</option>`)
regionEditorRegionsList.append(`<option value="${randomId}">${lang['Region Name']}</option>`)
regionEditorRegionsList.val(randomId)
regionEditorRegionsList.change()
return false;
@ -271,17 +274,12 @@ $(document).ready(function(e){
initLiveStream()
})
$('body')
.ready(function(e){
var dashboardSwitches = dashboardOptions().switches || {}
if(dashboardSwitches.regionStillImage === 1){
useRegionStillImage = true
}
})
.on('click','.open-region-editor',function(e){
var monitorId = getMonitorIdFromElement(this)
var monitor = loadedMonitors[monitorId]
openTab(`regionEditor`,{},null)
loadRegionEditor(monitor)
initLiveStream()
});
regionEditorMonitorsList.change(function(){
var monitorId = $(this).val()
@ -289,6 +287,7 @@ $(document).ready(function(e){
if(monitor)loadRegionEditor(monitor)
})
addOnTabOpen('regionEditor', function () {
useRegionStillImage = getRegionStillImageSwitch() === 1;
if(!regionEditorMonitorsList.val()){
drawMonitorListToSelector(regionEditorMonitorsList,true)
}