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:44:29 -07:00
parent aed3f5ee84
commit fa062c9e19
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
definitions/en_CA.js
View File

@ -5990,6 +5990,13 @@ module.exports = function(s,config,lang){
"class": `btn-info toggle-region-still-image`, "class": `btn-info toggle-region-still-image`,
"btnContent": `<i class="fa fa-retweet"></i> &nbsp; ${lang['Live Stream Toggle']}`, "btnContent": `<i class="fa fa-retweet"></i> &nbsp; ${lang['Live Stream Toggle']}`,
}, },
{
"fieldType": "btn",
forForm: true,
attribute: "href=#",
"class": `btn-success`,
"btnContent": `<i class="fa fa-check"></i> &nbsp; ${lang['Save']}`,
},
] ]
}, },
"Points": { "Points": {

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

@ -133,7 +133,7 @@ $(document).ready(function(e){
liveElement.attr('width',regionViewerDetails.detector_scale_x) liveElement.attr('width',regionViewerDetails.detector_scale_x)
liveElement.attr('height',regionViewerDetails.detector_scale_y) liveElement.attr('height',regionViewerDetails.detector_scale_y)
} }
var initCanvas = function(){ var initCanvas = function(dontReloadStream){
var newArray = []; var newArray = [];
var regionEditorRegionsListValue = regionEditorRegionsList.val(); var regionEditorRegionsListValue = regionEditorRegionsList.val();
if(!regionEditorRegionsListValue){ if(!regionEditorRegionsListValue){
@ -165,7 +165,7 @@ $(document).ready(function(e){
regionEditorForm.find('[name="threshold"]').val(cord.threshold) regionEditorForm.find('[name="threshold"]').val(cord.threshold)
regionEditorForm.find('[name="color_threshold"]').val(cord.color_threshold) regionEditorForm.find('[name="color_threshold"]').val(cord.color_threshold)
regionEditorWindow.find('.canvas_holder canvas').remove() regionEditorWindow.find('.canvas_holder canvas').remove()
initLiveStream() if(!dontReloadStream)initLiveStream();
regionEditorRegionsCanvas.val(newArray.join(',')) regionEditorRegionsCanvas.val(newArray.join(','))
regionEditorRegionsCanvas.canvasAreaDraw({ regionEditorRegionsCanvas.canvasAreaDraw({
imageUrl: placeholder.getData(placeholder.plcimg({ imageUrl: placeholder.getData(placeholder.plcimg({
@ -182,7 +182,7 @@ $(document).ready(function(e){
return dashboardSwitches.regionStillImage || '0' return dashboardSwitches.regionStillImage || '0'
} }
regionEditorRegionsList.change(function(e){ regionEditorRegionsList.change(function(e){
initCanvas(); initCanvas(true);
}) })
regionEditorWindow.on('change','[name]',function(){ regionEditorWindow.on('change','[name]',function(){
var currentRegionId = getCurrentlySelectedRegionId() var currentRegionId = getCurrentlySelectedRegionId()