diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php index 24ce53a61..88f73d8a0 100644 --- a/web/skins/classic/views/event.php +++ b/web/skins/classic/views/event.php @@ -49,9 +49,6 @@ if ( isset($_REQUEST['rate']) ) { if ( isset($_REQUEST['scale']) ) { $scale = validInt($_REQUEST['scale']); -} else if ( isset($_COOKIE['zmEventScaleAuto']) ) { - // If we're using scale to fit use it on all monitors - $scale = '0'; } else if ( isset($_COOKIE['zmEventScale'.$Event->MonitorId()]) ) { $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()]; } else { diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 9841ea425..1ddb111fa 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -176,12 +176,7 @@ function changeScale() { } else { alarmCue.html(renderAlarmCues(eventViewer));//just re-render alarmCues. skip ajax call } - if ( scale == '0' ) { - Cookie.write('zmEventScaleAuto', 'auto', {duration: 10*365, samesite: 'strict'}); - } else { - Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365, samesite: 'strict'}); - Cookie.dispose('zmEventScaleAuto'); - } + Cookie.write('zmEventScale'+eventData.MonitorId, scale, {duration: 10*365, samesite: 'strict'}); } // end function changeScale function changeReplayMode() {