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

eslint

This commit is contained in:
Andrew Bauer 2021-01-08 10:42:45 -06:00 committed by Isaac Connor
parent 2e815bc23e
commit 774d522cee
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
web/js/logger.js
View File

@ -149,13 +149,13 @@ function browserInfo() {
fullVersion = nAgt.substring(verOffset+5);
}
// In Chrome, the true version is after "Chrome"
// In Chrome, the true version is after "Chrome"
else if ((verOffset=nAgt.indexOf("Chrome")) != -1) {
browserName = "Chrome";
fullVersion = nAgt.substring(verOffset+7);
}
// In Safari, the true version is after "Safari" or after "Version"
// In Safari, the true version is after "Safari" or after "Version"
else if ((verOffset=nAgt.indexOf("Safari")) != -1) {
browserName = "Safari";
fullVersion = nAgt.substring(verOffset+7);
@ -164,15 +164,15 @@ function browserInfo() {
}
}
// In Firefox, the true version is after "Firefox"
// In Firefox, the true version is after "Firefox"
else if ((verOffset=nAgt.indexOf("Firefox")) != -1) {
browserName = "Firefox";
fullVersion = nAgt.substring(verOffset+8);
}
// In most other browsers, "name/version" is at the end of userAgent
// In most other browsers, "name/version" is at the end of userAgent
else if ( (nameOffset=nAgt.lastIndexOf(' ')+1) < (verOffset=nAgt.lastIndexOf('/')) ) {
browserName = nAgt.substring(nameOffset,verOffset);
browserName = nAgt.substring(nameOffset, verOffset);
fullVersion = nAgt.substring(verOffset+1);
if (browserName.toLowerCase()==browserName.toUpperCase()) {
browserName = navigator.appName;
@ -181,23 +181,23 @@ function browserInfo() {
// trim the fullVersion string at semicolon/space if present
if ((ix=fullVersion.indexOf(";")) != -1) {
fullVersion=fullVersion.substring(0,ix);
fullVersion=fullVersion.substring(0, ix);
}
if ((ix=fullVersion.indexOf(" ")) != -1) {
fullVersion=fullVersion.substring(0,ix);
fullVersion=fullVersion.substring(0, ix);
}
var majorVersion = parseInt(''+fullVersion,10);
var majorVersion = parseInt(''+fullVersion, 10);
if (isNaN(majorVersion)) {
fullVersion = ''+parseFloat(navigator.appVersion);
majorVersion = parseInt(navigator.appVersion,10);
fullVersion = ''+parseFloat(navigator.appVersion);
majorVersion = parseInt(navigator.appVersion, 10);
}
// OSName variable is set as follows:
// "Windows" for all versions of Windows
// "MacOS" for all versions of Macintosh OS
// "Linux" for all versions of Linux
// "UNIX" for all other UNIX flavors
// "UNIX" for all other UNIX flavors
// "Unknown OS" indicates failure to detect the OS
var OSName="Unknown OS";
if (navigator.appVersion.indexOf("Win") != -1) OSName="Windows";

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

@ -433,7 +433,7 @@ function streamFastRev( action ) {
}
clearInterval(intervalRewind);
$j('select[name="rate"]').val(-revSpeed*100);
setCookie('zmEventRate', vid.playbackRate()*100, 3600;
setCookie('zmEventRate', vid.playbackRate()*100, 3600);
intervalRewind = setInterval(function() {
if (vid.currentTime() <= 0) {
clearInterval(intervalRewind);