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

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,264 +25,227 @@
var popupOptions = "resizable,scrollbars,status=no"; var popupOptions = "resizable,scrollbars,status=no";
function checkSize() { function checkSize() {
if (window.outerHeight) { if (window.outerHeight) {
var w = window.outerWidth; var w = window.outerWidth;
var prevW = w; var prevW = w;
var h = window.outerHeight; var h = window.outerHeight;
var prevH = h; var prevH = h;
if (h > screen.availHeight) if (h > screen.availHeight)
h = screen.availHeight; h = screen.availHeight;
if (w > screen.availWidth) if (w > screen.availWidth)
w = screen.availWidth; w = screen.availWidth;
if (w != prevW || h != prevH) if (w != prevW || h != prevH)
window.resizeTo(w, h); window.resizeTo(w, h);
} }
} }
// Deprecated // Deprecated
function newWindow( url, name, width, height ) function newWindow( url, name, width, height ) {
{ var windowId = window.open( url, name, popupOptions+",width="+width+",height="+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] );
var popupSize = Object.clone( popupSizes[tag] ); if ( !popupSize ) {
if ( !popupSize ) Error( "Can't find window size for tag '"+tag+"'" );
{ return( { 'width': 0, 'height': 0 } );
Error( "Can't find window size for tag '"+tag+"'" ); }
return( { 'width': 0, 'height': 0 } ); if ( popupSize.width && popupSize.height ) {
} if ( width || height )
if ( popupSize.width && popupSize.height ) Warning( "Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'" );
{
if ( width || height )
Warning( "Ignoring passed dimensions "+width+"x"+height+" when getting popup size for tag '"+tag+"'" );
return( popupSize );
}
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 )
{
popupSize.width = width;
Error( "Got passed width but no addWidth when getting popup size for tag '"+tag+"'" );
}
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 )
{
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 )
{
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+"'" );
popupSize.height = popupSize.minHeight;
}
Debug( popupSize );
return( popupSize ); return( popupSize );
}
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 ) {
popupSize.width = width;
Error( "Got passed width but no addWidth when getting popup size for tag '"+tag+"'" );
}
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 ) {
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 ) {
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 ("+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' );
var zmWin = window.open( 'http://www.zoneminder.com', 'ZoneMinder' ); if ( ! zmWin ) {
if ( ! zmWin ) { // if popup blocking is enabled, the popup won't be defined.
// if popup blocking is enabled, the popup won't be defined. console.log("Please disable popup blocking.");
console.log("Please disable popup blocking."); } else {
} else { zmWin.focus();
zmWin.focus(); }
}
} }
function createPopup( url, name, tag, width, height ) function createPopup( url, name, tag, width, height ) {
{ var popupSize = getPopupSize( tag, width, height );
var popupSize = getPopupSize( tag, width, height ); var popupDimensions = "";
var popupDimensions = ""; if ( popupSize.width > 0 )
if ( popupSize.width > 0 ) popupDimensions += ",width="+popupSize.width;
popupDimensions += ",width="+popupSize.width; if ( popupSize.height > 0 )
if ( popupSize.height > 0 ) popupDimensions += ",height="+popupSize.height;
popupDimensions += ",height="+popupSize.height; var popup = window.open( url, name, popupOptions+popupDimensions );
var popup = window.open( url, name, popupOptions+popupDimensions ); if ( ! popup ) {
if ( ! popup ) { // if popup blocking is enabled, the popup won't be defined.
// if popup blocking is enabled, the popup won't be defined. console.log("Please disable popup blocking.");
console.log("Please disable popup blocking."); } else {
} else { popup.focus();
popup.focus(); }
}
} }
function createEventPopup( eventId, eventFilter, width, height ) function createEventPopup( eventId, eventFilter, width, height ) {
{ var url = '?view=event&eid='+eventId;
var url = '?view=event&eid='+eventId; if ( eventFilter )
if ( eventFilter ) url += eventFilter;
url += eventFilter; var name = 'zmEvent';
var name = 'zmEvent'; var popupSize = getPopupSize( 'event', width, height );
var popupSize = getPopupSize( 'event', width, height ); var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height ); if ( ! popup ) {
if ( ! popup ) { // if popup blocking is enabled, the popup won't be defined.
// if popup blocking is enabled, the popup won't be defined. console.log("Please disable popup blocking.");
console.log("Please disable popup blocking."); } else {
} else { popup.focus();
popup.focus(); }
}
} }
function createFramesPopup( eventId, width, height ) function createFramesPopup( eventId, width, height ) {
{ var url = '?view=frames&eid='+eventId;
var url = '?view=frames&eid='+eventId; var name = 'zmFrames';
var name = 'zmFrames'; var popupSize = getPopupSize( 'frames', width, height );
var popupSize = getPopupSize( 'frames', width, height ); var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height ); if ( ! popup ) {
if ( ! popup ) { // if popup blocking is enabled, the popup won't be defined.
// if popup blocking is enabled, the popup won't be defined. console.log("Please disable popup blocking.");
console.log("Please disable popup blocking."); } else {
} else { popup.focus();
popup.focus(); }
}
} }
function createFramePopup( eventId, frameId, width, height ) function createFramePopup( eventId, frameId, width, height ) {
{ var url = '?view=frame&eid='+eventId+'&fid='+frameId;
var url = '?view=frame&eid='+eventId+'&fid='+frameId; var name = 'zmFrame';
var name = 'zmFrame'; var popupSize = getPopupSize( 'frame', width, height );
var popupSize = getPopupSize( 'frame', width, height ); var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height );
var popup = window.open( url, name, popupOptions+",width="+popupSize.width+",height="+popupSize.height ); if ( ! popup ) {
if ( ! popup ) { // if popup blocking is enabled, the popup won't be defined.
// if popup blocking is enabled, the popup won't be defined. console.log("Please disable popup blocking.");
console.log("Please disable popup blocking."); } else {
} else { popup.focus();
popup.focus(); }
}
} }
function windowToFront() function windowToFront() {
{ top.window.focus();
top.window.focus();
} }
function closeWindow() function closeWindow() {
{ top.window.close();
top.window.close();
} }
function refreshWindow() function refreshWindow() {
{ window.location.reload( true );
window.location.reload( true );
} }
function refreshParentWindow() function refreshParentWindow() {
{ if ( window.opener )
if ( window.opener ) window.opener.location.reload( true );
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. //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 ) function checkStreamForErrors( funcName, streamObj ) {
{ if ( !streamObj ) {
if ( !streamObj ) Error( funcName+": stream object was null" );
{ return true;
Error( funcName+": stream object was null" ); }
return true; if ( streamObj.result == "Error" ) {
} Error( funcName+" stream error: "+streamObj.message );
if ( streamObj.result == "Error" ) return true;
{ }
Error( funcName+" stream error: "+streamObj.message ); return false;
return true;
}
return false;
} }
function secsToTime( seconds ) function secsToTime( seconds ) {
{ var timeString = "--";
var timeString = "--"; if ( seconds < 60 ) {
if ( seconds < 60 ) timeString = seconds.toString();
timeString = seconds.toString(); } else if ( seconds < 60*60 ) {
else if ( seconds < 60*60 ) var timeMins = parseInt(seconds/60);
{ var timeSecs = seconds%60;
var timeMins = parseInt(seconds/60); if ( timeSecs < 10 )
var timeSecs = seconds%60; timeSecs = '0'+timeSecs.toString().substr( 0, 4 );
if ( timeSecs < 10 )
timeSecs = '0'+timeSecs.toString().substr( 0, 4 );
else
timeSecs = timeSecs.toString().substr( 0, 5 );
timeString = timeMins+":"+timeSecs;
}
else else
{ timeSecs = timeSecs.toString().substr( 0, 5 );
var timeHours = parseInt(seconds/3600); timeString = timeMins+":"+timeSecs;
var timeMins = (seconds%3600)/60; } else {
var timeSecs = seconds%60; var timeHours = parseInt(seconds/3600);
if ( timeMins < 10 ) var timeMins = (seconds%3600)/60;
timeMins = '0'+timeMins.toString().substr( 0, 4 ); var timeSecs = seconds%60;
else if ( timeMins < 10 )
timeMins = timeMins.toString().substr( 0, 5 ); timeMins = '0'+timeMins.toString().substr( 0, 4 );
if ( timeSecs < 10 ) else
timeSecs = '0'+timeSecs.toString().substr( 0, 4 ); timeMins = timeMins.toString().substr( 0, 5 );
else if ( timeSecs < 10 )
timeSecs = timeSecs.toString().substr( 0, 5 ); timeSecs = '0'+timeSecs.toString().substr( 0, 4 );
timeString = timeHours+":"+timeMins+":"+timeSecs; else
} timeSecs = timeSecs.toString().substr( 0, 5 );
return( timeString ); timeString = timeHours+":"+timeMins+":"+timeSecs;
}
return( timeString );
} }
function submitTab( tab ) function submitTab( tab ) {
{ var form = $('contentForm');
var form = $('contentForm'); form.action.value = "";
form.action.value = ""; form.tab.value = tab;
form.tab.value = tab; form.submit();
form.submit();
} }
function configureDeleteButton( element ) function configureDeleteButton( element ) {
{ var form = element.form;
var form = element.form; var checked = element.checked;
var checked = element.checked; if ( !checked ) {
if ( !checked ) for ( var i = 0; i < form.elements.length; i++ ) {
{ if ( form.elements[i].name == element.name ) {
for ( var i = 0; i < form.elements.length; i++ ) if ( form.elements[i].checked ) {
{ checked = true;
if ( form.elements[i].name == element.name ) break;
{
if ( form.elements[i].checked )
{
checked = true;
break;
}
}
} }
}
} }
form.deleteBtn.disabled = !checked; }
form.deleteBtn.disabled = !checked;
} }
function confirmDelete( message ) function confirmDelete( message ) {
{ return( confirm( message?message:'Are you sure you wish to delete?' ) );
return( confirm( message?message:'Are you sure you wish to delete?' ) );
} }
if ( refreshParent ) if ( refreshParent ) {
{ refreshParentWindow();
refreshParentWindow();
} }
if ( focusWindow ) if ( focusWindow ) {
{ windowToFront();
windowToFront();
} }
window.addEvent( 'domready', checkSize); 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); track.src = 'data:plain/text;charset=utf-8,'+encodeURIComponent(webvttdata);
video.appendChild(track); video.appendChild(track);
} }