braces and spacing

This commit is contained in:
Isaac Connor 2017-07-13 10:25:14 -04:00
parent c9689aa010
commit cb88952a77
1 changed files with 179 additions and 217 deletions

View File

@ -40,67 +40,54 @@ function checkSize() {
}
// Deprecated
function newWindow( url, name, width, height )
{
function newWindow( url, name, width, height ) {
var windowId = window.open( url, name, popupOptions+",width="+width+",height="+height );
}
function getPopupSize( tag, width, height )
{
function getPopupSize( tag, width, height ) {
var popupSize = Object.clone( popupSizes[tag] );
if ( !popupSize )
{
if ( !popupSize ) {
Error( "Can't find window size for tag '"+tag+"'" );
return( { 'width': 0, 'height': 0 } );
}
if ( popupSize.width && popupSize.height )
{
if ( popupSize.width && popupSize.height ) {
if ( width || height )
Warning( "Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'" );
return( popupSize );
}
if ( popupSize.addWidth )
{
if ( popupSize.addWidth ) {
popupSize.width = popupSize.addWidth;
if ( !width )
Error( "Got addWidth but no passed width when getting popup size for tag '"+tag+"'" );
else
popupSize.width += parseInt(width);
}
else if ( width )
{
} else if ( width ) {
popupSize.width = width;
Error( "Got passed width but no addWidth when getting popup size for tag '"+tag+"'" );
}
if ( popupSize.minWidth && popupSize.width < popupSize.minWidth )
{
if ( popupSize.minWidth && popupSize.width < popupSize.minWidth ) {
Warning( "Adjusting to minimum width when getting popup size for tag '"+tag+"'" );
popupSize.width = popupSize.minWidth;
}
if ( popupSize.addHeight )
{
if ( popupSize.addHeight ) {
popupSize.height = popupSize.addHeight;
if ( !height )
Error( "Got addHeight but no passed height when getting popup size for tag '"+tag+"'" );
else
popupSize.height += parseInt(height);
}
else if ( height )
{
} else if ( height ) {
popupSize.height = height;
Error( "Got passed height but no addHeight when getting popup size for tag '"+tag+"'" );
}
if ( popupSize.minHeight && popupSize.height < popupSize.minHeight )
{
Warning( "Adjusting to minimum height when getting popup size for tag '"+tag+"'" );
if ( popupSize.minHeight && ( popupSize.height < popupSize.minHeight ) ) {
Warning( "Adjusting to minimum height ("+popupSize.minHeight+") when getting popup size for tag '"+tag+"' because calculated height is " + popupSize.height );
popupSize.height = popupSize.minHeight;
}
Debug( popupSize );
return( popupSize );
}
function zmWindow()
{
function zmWindow() {
var zmWin = window.open( 'http://www.zoneminder.com', 'ZoneMinder' );
if ( ! zmWin ) {
// if popup blocking is enabled, the popup won't be defined.
@ -110,8 +97,7 @@ function zmWindow()
}
}
function createPopup( url, name, tag, width, height )
{
function createPopup( url, name, tag, width, height ) {
var popupSize = getPopupSize( tag, width, height );
var popupDimensions = "";
if ( popupSize.width > 0 )
@ -127,8 +113,7 @@ function createPopup( url, name, tag, width, height )
}
}
function createEventPopup( eventId, eventFilter, width, height )
{
function createEventPopup( eventId, eventFilter, width, height ) {
var url = '?view=event&eid='+eventId;
if ( eventFilter )
url += eventFilter;
@ -143,8 +128,7 @@ function createEventPopup( eventId, eventFilter, width, height )
}
}
function createFramesPopup( eventId, width, height )
{
function createFramesPopup( eventId, width, height ) {
var url = '?view=frames&eid='+eventId;
var name = 'zmFrames';
var popupSize = getPopupSize( 'frames', width, height );
@ -157,8 +141,7 @@ function createFramesPopup( eventId, width, height )
}
}
function createFramePopup( eventId, frameId, width, height )
{
function createFramePopup( eventId, frameId, width, height ) {
var url = '?view=frame&eid='+eventId+'&fid='+frameId;
var name = 'zmFrame';
var popupSize = getPopupSize( 'frame', width, height );
@ -171,50 +154,41 @@ function createFramePopup( eventId, frameId, width, height )
}
}
function windowToFront()
{
function windowToFront() {
top.window.focus();
}
function closeWindow()
{
function closeWindow() {
top.window.close();
}
function refreshWindow()
{
function refreshWindow() {
window.location.reload( true );
}
function refreshParentWindow()
{
function refreshParentWindow() {
if ( window.opener )
window.opener.location.reload( true );
}
//Shows a message if there is an error in the streamObj or the stream doesn't exist. Returns true if error, false otherwise.
function checkStreamForErrors( funcName, streamObj )
{
if ( !streamObj )
{
function checkStreamForErrors( funcName, streamObj ) {
if ( !streamObj ) {
Error( funcName+": stream object was null" );
return true;
}
if ( streamObj.result == "Error" )
{
if ( streamObj.result == "Error" ) {
Error( funcName+" stream error: "+streamObj.message );
return true;
}
return false;
}
function secsToTime( seconds )
{
function secsToTime( seconds ) {
var timeString = "--";
if ( seconds < 60 )
if ( seconds < 60 ) {
timeString = seconds.toString();
else if ( seconds < 60*60 )
{
} else if ( seconds < 60*60 ) {
var timeMins = parseInt(seconds/60);
var timeSecs = seconds%60;
if ( timeSecs < 10 )
@ -222,9 +196,7 @@ function secsToTime( seconds )
else
timeSecs = timeSecs.toString().substr( 0, 5 );
timeString = timeMins+":"+timeSecs;
}
else
{
} else {
var timeHours = parseInt(seconds/3600);
var timeMins = (seconds%3600)/60;
var timeSecs = seconds%60;
@ -241,26 +213,20 @@ function secsToTime( seconds )
return( timeString );
}
function submitTab( tab )
{
function submitTab( tab ) {
var form = $('contentForm');
form.action.value = "";
form.tab.value = tab;
form.submit();
}
function configureDeleteButton( element )
{
function configureDeleteButton( element ) {
var form = element.form;
var checked = element.checked;
if ( !checked )
{
for ( var i = 0; i < form.elements.length; i++ )
{
if ( form.elements[i].name == element.name )
{
if ( form.elements[i].checked )
{
if ( !checked ) {
for ( var i = 0; i < form.elements.length; i++ ) {
if ( form.elements[i].name == element.name ) {
if ( form.elements[i].checked ) {
checked = true;
break;
}
@ -270,18 +236,15 @@ function configureDeleteButton( element )
form.deleteBtn.disabled = !checked;
}
function confirmDelete( message )
{
function confirmDelete( message ) {
return( confirm( message?message:'Are you sure you wish to delete?' ) );
}
if ( refreshParent )
{
if ( refreshParent ) {
refreshParentWindow();
}
if ( focusWindow )
{
if ( focusWindow ) {
windowToFront();
}
window.addEvent( 'domready', checkSize);
@ -320,4 +283,3 @@ function addVideoTimingTrack(video, LabelFormat, monitorName, duration, startTim
track.src = 'data:plain/text;charset=utf-8,'+encodeURIComponent(webvttdata);
video.appendChild(track);
}