From 75e2f526ae161af0e7df81594a60067f38ceeb9d Mon Sep 17 00:00:00 2001 From: Andrew Bauer Date: Mon, 4 Jan 2021 13:05:33 -0600 Subject: [PATCH] WIP jquery conversion --- web/skins/classic/views/js/controlpreset.js | 7 ++++--- web/skins/classic/views/js/filter.js | 6 +++--- web/skins/classic/views/js/monitor.js | 3 --- web/skins/classic/views/js/montagereview.js.php | 1 - 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/web/skins/classic/views/js/controlpreset.js b/web/skins/classic/views/js/controlpreset.js index f9683030a..4586d38b8 100644 --- a/web/skins/classic/views/js/controlpreset.js +++ b/web/skins/classic/views/js/controlpreset.js @@ -1,5 +1,5 @@ -function updateLabel() { - var form = $('contentForm'); +function initPage() { + var form = document.getElementById('contentForm'); var preset_ddm = form.elements['preset']; var presetIndex = preset_ddm[preset_ddm.selectedIndex].value; @@ -9,4 +9,5 @@ function updateLabel() { form.newLabel.value = ''; } } -window.addEventListener('DOMContentLoaded', updateLabel); + +$j(document).ready(initPage ); diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js index 670d0986a..c59e755ff 100644 --- a/web/skins/classic/views/js/filter.js +++ b/web/skins/classic/views/js/filter.js @@ -429,12 +429,12 @@ function manageModalBtns(id) { } } -function init() { - updateButtons( $('executeButton') ); +function initPage() { + updateButtons($j('#executeButton')[0]); $j('#Id').chosen(); $j('#fieldsTable select').not("[name$='br\\]'], [name$='cnj\\]']").chosen({width: '101%'}); //Every select except brackets/and $j("#sortTable [name$='sort_field\\]']").chosen(); parseRows($j('#fieldsTable tbody').children()); } -window.addEventListener( 'DOMContentLoaded', init ); +$j(document).ready(initPage ); diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js index ae6abacb0..1603df783 100644 --- a/web/skins/classic/views/js/monitor.js +++ b/web/skins/classic/views/js/monitor.js @@ -71,9 +71,6 @@ function initPage() { var backBtn = $j('#backBtn'); var onvifBtn = $j('#onvifBtn'); - //var protocolSelector = $('contentForm').elements['newMonitor[Protocol]']; - //if ( $(protocolSelector).getTag() == 'select' ) - //updateMethods( $(protocolSelector) ); document.querySelectorAll('input[name="newMonitor[SignalCheckColour]"]').forEach(function(el) { el.oninput = function(event) { $j('#SignalCheckSwatch').css('background-color', event.target.value); diff --git a/web/skins/classic/views/js/montagereview.js.php b/web/skins/classic/views/js/montagereview.js.php index 9a2206bc6..291bb99e8 100644 --- a/web/skins/classic/views/js/montagereview.js.php +++ b/web/skins/classic/views/js/montagereview.js.php @@ -230,7 +230,6 @@ for ( $i=0; $i < count($speeds); $i++ ) echo "];\n"; ?> -var scrubAsObject=$('scrub'); var cWidth; // save canvas width var cHeight; // save canvas height var canvas; // global canvas definition so we don't have to keep looking it up