From 00f8a450dee9928bf3a71a460bb67b3fe56553f5 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Sun, 5 Jan 2020 14:59:25 -0500 Subject: [PATCH] spaces and quotes --- web/skins/classic/views/js/event.js | 157 ++++++++++++++-------------- 1 file changed, 79 insertions(+), 78 deletions(-) diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js index 76fc47c79..f7da1341a 100644 --- a/web/skins/classic/views/js/event.js +++ b/web/skins/classic/views/js/event.js @@ -57,7 +57,7 @@ function setAlarmCues(data) { function renderAlarmCues(containerEl) { if ( !( cueFrames && cueFrames.length ) ) { - console.log("No cue frames for event"); + console.log('No cue frames for event'); return; } // This uses the Delta of the last frame to get the length of the event. I can't help but wonder though @@ -139,7 +139,7 @@ function setButtonState( element, butClass ) { element.disabled = false; } } else { - console.log("Element was null in setButtonState"); + console.log('Element was null in setButtonState'); } } @@ -211,7 +211,7 @@ var lastEventId = 0; var zmsBroke = false; //Use alternate navigation if zms has crashed function getCmdResponse( respObj, respText ) { - if ( checkStreamForErrors("getCmdResponse", respObj) ) { + if ( checkStreamForErrors('getCmdResponse', respObj) ) { console.log('Got an error from getCmdResponse'); console.log(respObj); console.log(respText); @@ -541,9 +541,9 @@ var scroll = null; var currEventId = null; var CurEventDefVideoPath = null; -function getEventResponse( respObj, respText ) { - if ( checkStreamForErrors( "getEventResponse", respObj ) ) { - console.log("getEventResponse: errors" ); +function getEventResponse(respObj, respText) { + if ( checkStreamForErrors('getEventResponse', respObj) ) { + console.log('getEventResponse: errors'); return; } @@ -582,7 +582,7 @@ function getEventResponse( respObj, respText ) { //eventImg.setStyles( { 'width': eventData.width, 'height': eventData.height } ); if ( vid && CurEventDefVideoPath ) { vid.src({type: 'video/mp4', src: CurEventDefVideoPath}); //Currently mp4 is all we use - console.log("getEventResponse"); + console.log('getEventResponse'); initialAlarmCues(eventData.Id);//ajax and render, new event addVideoTimingTrack(vid, LabelFormat, eventData.MonitorName, eventData.Length, eventData.StartTime); CurEventDefVideoPath = null; @@ -644,7 +644,7 @@ var frameBatch = 40; function loadEventThumb( event, frame, loadImage ) { var thumbImg = $('eventThumb'+frame.FrameId); if ( !thumbImg ) { - console.error( "No holder found for frame "+frame.FrameId ); + console.error('No holder found for frame '+frame.FrameId); return; } var img = new Asset.image( imagePrefix+frame.EventId+"&fid="+frame.FrameId, @@ -666,31 +666,31 @@ function loadEventThumb( event, frame, loadImage ) { ); } -function loadEventImage( event, frame ) { - console.debug( "Loading "+event.Id+"/"+frame.FrameId ); +function loadEventImage(event, frame) { + console.debug('Loading '+event.Id+'/'+frame.FrameId); var eventImg = $('eventImage'); var thumbImg = $('eventThumb'+frame.FrameId); - if ( eventImg.getProperty( 'src' ) != thumbImg.getProperty( 'src' ) ) { + if ( eventImg.getProperty('src') != thumbImg.getProperty('src') ) { var eventImagePanel = $('eventImagePanel'); - if ( eventImagePanel.getStyle( 'display' ) != 'none' ) { - var lastThumbImg = $('eventThumb'+eventImg.getProperty( 'alt' )); + if ( eventImagePanel.getStyle('display') != 'none' ) { + var lastThumbImg = $('eventThumb'+eventImg.getProperty('alt')); lastThumbImg.removeClass('selected'); - lastThumbImg.setOpacity( 1.0 ); + lastThumbImg.setOpacity(1.0); } - $('eventImageBar').setStyle( 'width', event.Width ); - if ( frame.Type=='Alarm' ) { - $('eventImageStats').removeClass( 'hidden' ); + $('eventImageBar').setStyle('width', event.Width); + if ( frame.Type == 'Alarm' ) { + $('eventImageStats').removeClass('hidden'); } else { - $('eventImageStats').addClass( 'hidden' ); + $('eventImageStats').addClass('hidden'); } - thumbImg.addClass( 'selected' ); - thumbImg.setOpacity( 0.5 ); + thumbImg.addClass('selected'); + thumbImg.setOpacity(0.5); - if ( eventImagePanel.getStyle( 'display' ) == 'none' ) { - eventImagePanel.setOpacity( 0 ); - eventImagePanel.setStyle( 'display', 'inline-block' ); + if ( eventImagePanel.getStyle('display') == 'none' ) { + eventImagePanel.setOpacity(0); + eventImagePanel.setStyle('display', 'inline-block'); new Fx.Tween( eventImagePanel, {duration: 500, transition: Fx.Transitions.Sine} ).start( 'opacity', 0, 1 ); } @@ -702,29 +702,29 @@ function loadEventImage( event, frame ) { 'height': $j('#eventThumbs').height() - $j('#eventImageBar').outerHeight(true)-10 } ); - $('eventImageNo').set( 'text', frame.FrameId ); + $('eventImageNo').set('text', frame.FrameId); $('prevImageBtn').disabled = (frame.FrameId==1); $('nextImageBtn').disabled = (frame.FrameId==event.Frames); } } function hideEventImageComplete() { - var thumbImg = $('eventThumb'+$('eventImage').getProperty( 'alt' )); + var thumbImg = $('eventThumb'+$('eventImage').getProperty('alt')); if ( thumbImg ) { thumbImg.removeClass('selected'); - thumbImg.setOpacity( 1.0 ); + thumbImg.setOpacity(1.0); } else { - console.log("Unable to find eventThumb at " + 'eventThumb'+$('eventImage').getProperty( 'alt' ) ); + console.log('Unable to find eventThumb at eventThumb'+$('eventImage').getProperty('alt')); } $('prevImageBtn').disabled = true; $('nextImageBtn').disabled = true; - $('eventImagePanel').setStyle( 'display', 'none' ); - $('eventImageStats').addClass( 'hidden' ); + $('eventImagePanel').setStyle('display', 'none'); + $('eventImageStats').addClass('hidden'); } function hideEventImage() { - if ( $('eventImagePanel').getStyle( 'display' ) != 'none' ) { - new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start( 'opacity', 1, 0 ); + if ( $('eventImagePanel').getStyle('display') != 'none' ) { + new Fx.Tween( $('eventImagePanel'), {duration: 500, transition: Fx.Transitions.Sine, onComplete: hideEventImageComplete} ).start('opacity', 1, 0); } } @@ -751,15 +751,15 @@ function resetEventStills() { } } -function getFrameResponse( respObj, respText ) { - if ( checkStreamForErrors( "getFrameResponse", respObj ) ) { +function getFrameResponse(respObj, respText) { + if ( checkStreamForErrors('getFrameResponse', respObj) ) { return; } var frame = respObj.frameimage; if ( !eventData ) { - console.error( "No event "+frame.EventId+" found" ); + console.error('No event '+frame.EventId+' found'); return; } @@ -769,21 +769,21 @@ function getFrameResponse( respObj, respText ) { eventData['frames'][frame.FrameId] = frame; - loadEventThumb( eventData, frame, respObj.loopback=="true" ); + loadEventThumb(eventData, frame, respObj.loopback=="true"); } var frameReq = new Request.JSON( {url: thisUrl, method: 'get', timeout: AJAX_TIMEOUT, link: 'chain', onSuccess: getFrameResponse} ); function frameQuery( eventId, frameId, loadImage ) { var parms = "view=request&request=status&entity=frameimage&id[0]="+eventId+"&id[1]="+frameId+"&loopback="+loadImage; - frameReq.send( parms ); + frameReq.send(parms); } var currFrameId = null; function checkFrames( eventId, frameId, loadImage ) { if ( !eventData ) { - console.error( "No event "+eventId+" found" ); + console.error("No event "+eventId+" found"); return; } @@ -804,29 +804,30 @@ function checkFrames( eventId, frameId, loadImage ) { for ( var fid = loFid; fid <= hiFid; fid++ ) { if ( !$('eventThumb'+fid) ) { - var img = new Element( 'img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'} ); - img.addEvent( 'click', function() { - eventData['frames'][fid] = null; checkFrames( eventId, fid ); - } ); - frameQuery( eventId, fid, loadImage && (fid == frameId) ); - var imgs = $('eventThumbs').getElements( 'img' ); + var img = new Element('img', {'id': 'eventThumb'+fid, 'src': 'graphics/transparent.png', 'alt': fid, 'class': 'placeholder'}); + img.addEvent('click', function() { + eventData['frames'][fid] = null; + checkFrames(eventId, fid); + }); + frameQuery(eventId, fid, loadImage && (fid == frameId)); + var imgs = $('eventThumbs').getElements('img'); var injected = false; if ( fid < imgs.length ) { - img.inject( imgs[fid-1], 'before' ); + img.inject(imgs[fid-1], 'before'); injected = true; } else { injected = imgs.some( function( thumbImg, index ) { - if ( parseInt(img.getProperty( 'alt' )) < parseInt(thumbImg.getProperty( 'alt' )) ) { - img.inject( thumbImg, 'before' ); - return ( true ); + if ( parseInt(img.getProperty('alt')) < parseInt(thumbImg.getProperty('alt')) ) { + img.inject(thumbImg, 'before'); + return true; } - return ( false ); + return false; } ); } if ( !injected ) { - img.inject( $('eventThumbs') ); + img.inject($('eventThumbs')); } var scale = parseInt(img.getStyle('height')); img.setStyles( { @@ -923,7 +924,7 @@ function deleteEvent() { getActResponse(respObj, respText); // We must wait for the deletion to happen before navigating to the next // event or this request will be cancelled. - streamNext( true ); + streamNext(true); }, }); deleteReq.send("view=request&request=event&id="+eventData.Id+"&action=delete"); @@ -931,43 +932,43 @@ function deleteEvent() { function renameEvent() { var newName = $('eventName').get('value'); - actQuery( 'rename', {eventName: newName} ); + actQuery('rename', {eventName: newName}); } function editEvent() { - createPopup( '?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail' ); + createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail'); } function exportEvent() { - createPopup( '?view=export&eid='+eventData.Id, 'zmExport', 'export' ); + createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export'); } function archiveEvent() { - actQuery( 'archive' ); + actQuery('archive'); } function unarchiveEvent() { - actQuery( 'unarchive' ); + actQuery('unarchive'); } function showEventFrames() { - createPopup( '?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT ); + createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT); } function showStream() { - $('eventStills').addClass( 'hidden' ); - $('eventVideo').removeClass( 'hidden' ); + $('eventStills').addClass('hidden'); + $('eventVideo').removeClass('hidden'); - $('stillsEvent').removeClass( 'hidden' ); - $('streamEvent').addClass( 'hidden' ); + $('stillsEvent').removeClass('hidden'); + $('streamEvent').addClass('hidden'); streamMode = 'video'; if (scale == 'auto') changeScale(); } function showStills() { - $('eventStills').removeClass( 'hidden' ); - $('eventVideo').addClass( 'hidden' ); + $('eventStills').removeClass('hidden'); + $('eventVideo').addClass('hidden'); if (vid && ( vid.paused != true ) ) { // Pause the video @@ -978,14 +979,14 @@ function showStills() { //playButton.innerHTML = "Play"; } - $('stillsEvent').addClass( 'hidden' ); - $('streamEvent').removeClass( 'hidden' ); + $('stillsEvent').addClass('hidden'); + $('streamEvent').removeClass('hidden'); streamMode = 'stills'; pauseClicked(); if ( !scroll ) { - scroll = new Fx.Scroll( 'eventThumbs', { + scroll = new Fx.Scroll('eventThumbs', { wait: false, duration: 500, offset: {'x': 0, 'y': 0}, @@ -999,17 +1000,17 @@ function showStills() { function showFrameStats() { var fid = $('eventImageNo').get('text'); - createPopup( '?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height ); + createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height); } function videoEvent() { - createPopup( '?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height ); + createPopup('?view=video&eid='+eventData.Id, 'zmVideo', 'video', eventData.Width, eventData.Height); } // Called on each event load because each event can be a different width function drawProgressBar() { var barWidth = $j('#evtStream').width(); - $j('#progressBar').css( 'width', barWidth ); + $j('#progressBar').css('width', barWidth); } // Shows current stream progress. @@ -1032,8 +1033,8 @@ function progressBarNav() { function handleClick( event ) { var target = event.target; - if (vid) { - if (target.id != 'videoobj') return; //ignore clicks on control bar + if ( vid ) { + if (target.id != 'videoobj') return; // ignore clicks on control bar var x = event.offsetX; var y = event.offsetY; } else { @@ -1041,9 +1042,9 @@ function handleClick( event ) { var y = event.page.y - $(target).getTop(); } - if (event.shift || event.shiftKey) {//handle both jquery and mootools + if ( event.shift || event.shiftKey ) { // handle both jquery and mootools streamPan(x, y); - } else if (vid && event.ctrlKey) { //allow zoom out by control click. useful in fullscreen + } else if ( vid && event.ctrlKey ) { // allow zoom out by control click. useful in fullscreen vjsPanZoom('zoomOut', x, y); } else { streamZoomIn(x, y); @@ -1072,7 +1073,7 @@ function initPage() { } } else { progressBarNav(); - streamCmdTimer = streamQuery.delay( 250 ); + streamCmdTimer = streamQuery.delay(250); if ( canStreamNative ) { var imageFeed = $('imageFeed'); if ( !imageFeed ) { @@ -1082,16 +1083,16 @@ function initPage() { if ( !streamImg ) { streamImg = imageFeed.getElement('object'); } - $(streamImg).addEvent( 'click', function( event ) { - handleClick( event ); - } ); + $(streamImg).addEvent('click', function(event) { + handleClick(event); + }); } } } nearEventsQuery(eventData.Id); initialAlarmCues(eventData.Id); //call ajax+renderAlarmCues - if (scale == "auto") changeScale(); + if ( scale == 'auto' ) changeScale(); } // Kick everything off -window.addEventListener( 'DOMContentLoaded', initPage ); +window.addEventListener('DOMContentLoaded', initPage);