diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js index 7be060465..890b02fef 100644 --- a/web/skins/classic/js/skin.js +++ b/web/skins/classic/js/skin.js @@ -842,7 +842,7 @@ function exportResponse(data, responseText) { $j('#downloadLink').attr("href", thisUrl + exportFile); $j('#exportProgress').addClass( 'text-success' ); $j('#exportProgress').text(exportSucceededString); - startDownload.pass( exportFile ).delay( 1500 ); + setTimeout(startDownload, 1500, exportFile); } else { $j('#exportProgress').addClass( 'text-danger' ); $j('#exportProgress').text(exportFailedString); diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index c9be49fdd..3ff5aed32 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -313,7 +313,7 @@ function getCmdResponse( respObj, respText ) { } } // 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 ) function pauseClicked() { @@ -1150,7 +1150,7 @@ function initPage() { } } else { progressBarNav(); - streamCmdTimer = streamQuery.delay(250); + streamCmdTimer = setTimeout(streamQuery, 250); if ( canStreamNative ) { if ( !$j('#imageFeed') ) { console.log('No element with id tag imageFeed found.'); diff --git a/web/skins/classic/views/js/monitorpreset.js b/web/skins/classic/views/js/monitorpreset.js index f8e11e1cc..1b8fa5e58 100644 --- a/web/skins/classic/views/js/monitorpreset.js +++ b/web/skins/classic/views/js/monitorpreset.js @@ -4,7 +4,6 @@ function submitPreset( element ) { form.target = opener.name; form.view.value = 'monitor'; form.submit(); - closeWindow.delay( 250 ); } function configureButtons() { diff --git a/web/skins/classic/views/js/monitorprobe.js b/web/skins/classic/views/js/monitorprobe.js index cc507b8d9..1b628ed69 100644 --- a/web/skins/classic/views/js/monitorprobe.js +++ b/web/skins/classic/views/js/monitorprobe.js @@ -3,7 +3,6 @@ function submitCamera( element ) { form.target = opener.name; form.view.value = 'monitor'; form.submit(); - closeWindow.delay( 250 ); } function configureButtons( element ) { diff --git a/web/skins/classic/views/js/onvifprobe.js b/web/skins/classic/views/js/onvifprobe.js index 4f10e5c29..28faa3175 100644 --- a/web/skins/classic/views/js/onvifprobe.js +++ b/web/skins/classic/views/js/onvifprobe.js @@ -3,7 +3,6 @@ function submitCamera( element ) { form.target = self.name; form.view.value = 'monitor'; form.submit(); - closeWindow.delay( 250 ); } function gotoStep1( element ) { diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js index 7616ca3f1..9c11c5b21 100644 --- a/web/skins/classic/views/js/watch.js +++ b/web/skins/classic/views/js/watch.js @@ -311,7 +311,7 @@ function getStreamCmdResponse(respObj, respText) { if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) { streamCmdTimeout = streamCmdTimeout/5; } - streamCmdTimer = streamCmdQuery.delay(streamCmdTimeout); + streamCmdTimer = setTimeout(streamCmdQuery, streamCmdTimeout); } function streamCmdPause( action ) { @@ -525,7 +525,7 @@ function getStatusCmdResponse(respObj, respText) { if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT ) { statusCmdTimeout = statusCmdTimeout/5; } - statusCmdTimer = statusCmdQuery.delay(statusCmdTimeout); + statusCmdTimer = setTimeout(statusCmdQuery, statusCmdTimeout); } function statusCmdQuery() { @@ -713,10 +713,10 @@ function appletRefresh() { console.error("Nothing found for liveStream"+monitorId); } if ( appletRefreshTime ) { - appletRefresh.delay( appletRefreshTime*1000 ); + setTimeout(appletRefresh, appletRefreshTime*1000); } } 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 ( streamMode == 'single' ) { - statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); + statusCmdTimer = setTimeout(statusCmdQuery, (Math.random()+0.1)*statusRefreshTimeout ); setInterval(watchdogCheck, statusRefreshTimeout*2, 'status'); } else { - streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout ); + streamCmdTimer = setTimeout(streamCmdQuery, (Math.random()+0.1)*statusRefreshTimeout ); setInterval(watchdogCheck, statusRefreshTimeout*2, 'stream'); } @@ -870,7 +870,7 @@ function initPage() { } // streamMode native or single if ( refreshApplet && appletRefreshTime ) { - appletRefresh.delay(appletRefreshTime*1000); + setTimeout(appletRefresh, appletRefreshTime*1000); } if ( window.history.length == 1 ) { $j('#closeControl').html('');