ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace mootools .delay method

This commit is contained in:
Andrew Bauer 2021-01-08 12:25:17 -06:00 committed by Isaac Connor
parent 0963795e44
commit 638e801c07
6 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/skins/classic/js/skin.js
View File

@ -842,7 +842,7 @@ function exportResponse(data, responseText) {
$j('#downloadLink').attr("href", thisUrl + exportFile); $j('#downloadLink').attr("href", thisUrl + exportFile);
$j('#exportProgress').addClass( 'text-success' ); $j('#exportProgress').addClass( 'text-success' );
$j('#exportProgress').text(exportSucceededString); $j('#exportProgress').text(exportSucceededString);
startDownload.pass( exportFile ).delay( 1500 ); setTimeout(startDownload, 1500, exportFile);
} else { } else {
$j('#exportProgress').addClass( 'text-danger' ); $j('#exportProgress').addClass( 'text-danger' );
$j('#exportProgress').text(exportFailedString); $j('#exportProgress').text(exportFailedString);

4
web/skins/classic/views/js/event.js
View File

@ -313,7 +313,7 @@ function getCmdResponse( respObj, respText ) {
} }
} // end if haev a new auth hash } // end if haev a new auth hash
streamCmdTimer = streamQuery.delay(streamTimeout); //Timeout is refresh rate for progressBox and time display streamCmdTimer = setTimeout(streamQuery, streamTimeout); //Timeout is refresh rate for progressBox and time display
} // end function getCmdResponse( respObj, respText ) } // end function getCmdResponse( respObj, respText )
function pauseClicked() { function pauseClicked() {
@ -1150,7 +1150,7 @@ function initPage() {
} }
} else { } else {
progressBarNav(); progressBarNav();
streamCmdTimer = streamQuery.delay(250); streamCmdTimer = setTimeout(streamQuery, 250);
if ( canStreamNative ) { if ( canStreamNative ) {
if ( !$j('#imageFeed') ) { if ( !$j('#imageFeed') ) {
console.log('No element with id tag imageFeed found.'); console.log('No element with id tag imageFeed found.');

1
web/skins/classic/views/js/monitorpreset.js
View File

@ -4,7 +4,6 @@ function submitPreset( element ) {
form.target = opener.name; form.target = opener.name;
form.view.value = 'monitor'; form.view.value = 'monitor';
form.submit(); form.submit();
closeWindow.delay( 250 );
} }
function configureButtons() { function configureButtons() {

1
web/skins/classic/views/js/monitorprobe.js
View File

@ -3,7 +3,6 @@ function submitCamera( element ) {
form.target = opener.name; form.target = opener.name;
form.view.value = 'monitor'; form.view.value = 'monitor';
form.submit(); form.submit();
closeWindow.delay( 250 );
} }
function configureButtons( element ) { function configureButtons( element ) {

1
web/skins/classic/views/js/onvifprobe.js
View File

@ -3,7 +3,6 @@ function submitCamera( element ) {
form.target = self.name; form.target = self.name;
form.view.value = 'monitor'; form.view.value = 'monitor';
form.submit(); form.submit();
closeWindow.delay( 250 );
} }
function gotoStep1( element ) { function gotoStep1( element ) {

14
web/skins/classic/views/js/watch.js
View File

@ -311,7 +311,7 @@ function getStreamCmdResponse(respObj, respText) {
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) { if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
streamCmdTimeout = streamCmdTimeout/5; streamCmdTimeout = streamCmdTimeout/5;
} }
streamCmdTimer = streamCmdQuery.delay(streamCmdTimeout); streamCmdTimer = setTimeout(streamCmdQuery, streamCmdTimeout);
} }
function streamCmdPause( action ) { function streamCmdPause( action ) {
@ -525,7 +525,7 @@ function getStatusCmdResponse(respObj, respText) {
if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) { if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) {
statusCmdTimeout = statusCmdTimeout/5; statusCmdTimeout = statusCmdTimeout/5;
} }
statusCmdTimer = statusCmdQuery.delay(statusCmdTimeout); statusCmdTimer = setTimeout(statusCmdQuery, statusCmdTimeout);
} }
function statusCmdQuery() { function statusCmdQuery() {
@ -713,10 +713,10 @@ function appletRefresh() {
console.error("Nothing found for liveStream"+monitorId); console.error("Nothing found for liveStream"+monitorId);
} }
if ( appletRefreshTime ) { if ( appletRefreshTime ) {
appletRefresh.delay( appletRefreshTime*1000 ); setTimeout(appletRefresh, appletRefreshTime*1000);
} }
} else { } else {
appletRefresh.delay( 15*1000 ); //if we are paused or delayed check every 15 seconds if we are live yet... setTimeout(appletRefresh, 15*1000 ); //if we are paused or delayed check every 15 seconds if we are live yet...
} }
} }
@ -843,10 +843,10 @@ function initPage() {
if ( monitorType != 'WebSite' ) { if ( monitorType != 'WebSite' ) {
if ( streamMode == 'single' ) { if ( streamMode == 'single' ) {
statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout );
setInterval(watchdogCheck, statusRefreshTimeout*2, 'status'); setInterval(watchdogCheck, statusRefreshTimeout*2, 'status');
} else { } else {
streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); streamCmdTimer = setTimeout(streamCmdQuery, (Math.random()+0.1)*statusRefreshTimeout );
setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream'); setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream');
} }
@ -870,7 +870,7 @@ function initPage() {
} // streamMode native or single } // streamMode native or single
if ( refreshApplet && appletRefreshTime ) { if ( refreshApplet && appletRefreshTime ) {
appletRefresh.delay(appletRefreshTime*1000); setTimeout(appletRefresh, appletRefreshTime*1000);
} }
if ( window.history.length == 1 ) { if ( window.history.length == 1 ) {
$j('#closeControl').html(''); $j('#closeControl').html('');