ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

whitespace and jquery

pull/3122/head
digital-gnome 2017-10-21 20:22:05 -04:00
parent 169b64813b
commit c6373d3dca
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
web/skins/classic/views/event.php
View File

@ -36,12 +36,13 @@ if ( $user['MonitorIds'] ) {
} }
$Monitor = $Event->Monitor(); $Monitor = $Event->Monitor();
if ( isset( $_REQUEST['rate'] ) ) if (isset($_REQUEST['rate'])) {
$rate = validInt($_REQUEST['rate']); $rate = validInt($_REQUEST['rate']);
else } else {
$rate = reScale( RATE_BASE, $Monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE ); $rate = reScale(RATE_BASE, $Monitor->DefaultRate(), ZM_WEB_DEFAULT_RATE);
}
if ( isset( $_REQUEST['scale'] ) ) { if (isset($_REQUEST['scale'])) {
$scale = validInt($_REQUEST['scale']); $scale = validInt($_REQUEST['scale']);
} else if ( isset( $_COOKIE['zmEventScale'.$Event->MonitorId()] ) ) { } else if ( isset( $_COOKIE['zmEventScale'.$Event->MonitorId()] ) ) {
$scale = $_COOKIE['zmEventScale'.$Event->MonitorId()]; $scale = $_COOKIE['zmEventScale'.$Event->MonitorId()];

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

@ -924,11 +924,11 @@ function setupListener() {
function initPage() { function initPage() {
//FIXME prevent blocking...not sure what is happening or best way to unblock //FIXME prevent blocking...not sure what is happening or best way to unblock
if ( $('videoobj') ) { if ($j('#videoobj').length) {
vid = videojs("videoobj"); vid = videojs("videoobj");
initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues after videojs is. should be only call to initialAlarmCues on vjs streams initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues after videojs is. should be only call to initialAlarmCues on vjs streams
} }
if ( vid ) { if (vid) {
/* /*
setupListener(); setupListener();
vid.removeAttribute("controls"); vid.removeAttribute("controls");