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

don't set popup flag in event view

This commit is contained in:
Andrew Bauer 2020-10-14 13:59:15 -05:00
parent e69b3800c7
commit ec040b1bfd
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -434,14 +434,14 @@ function streamFastRev( action ) {
function streamPrev(action) { function streamPrev(action) {
if ( action ) { if ( action ) {
$j(".vjsMessage").remove(); $j(".vjsMessage").remove();
location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery + '&popup='+popup); location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
return; return;
if ( vid && PrevEventDefVideoPath.indexOf("view_video") > 0 ) { if ( vid && PrevEventDefVideoPath.indexOf("view_video") > 0 ) {
CurEventDefVideoPath = PrevEventDefVideoPath; CurEventDefVideoPath = PrevEventDefVideoPath;
eventQuery(prevEventId); eventQuery(prevEventId);
} else if (zmsBroke || (vid && PrevEventDefVideoPath.indexOf("view_video") < 0) || $j("#vjsMessage").length || PrevEventDefVideoPath.indexOf("view_video") > 0) {//zms broke, leaving videojs, last event, moving to videojs } else if (zmsBroke || (vid && PrevEventDefVideoPath.indexOf("view_video") < 0) || $j("#vjsMessage").length || PrevEventDefVideoPath.indexOf("view_video") > 0) {//zms broke, leaving videojs, last event, moving to videojs
location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery + '&popup='+popup); location.replace(thisUrl + '?view=event&eid=' + prevEventId + filterQuery + sortQuery);
} else { } else {
streamReq.send(streamParms+"&command="+CMD_PREV); streamReq.send(streamParms+"&command="+CMD_PREV);
streamPlay(); streamPlay();
@ -463,13 +463,13 @@ function streamNext(action) {
// We used to try to dynamically update all the bits in the page, which is really complex // We used to try to dynamically update all the bits in the page, which is really complex
// How about we just reload the page? // How about we just reload the page?
// //
location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery + '&popup='+popup); location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
return; return;
if ( vid && ( NextEventDefVideoPath.indexOf("view_video") > 0 ) ) { //on and staying with videojs if ( vid && ( NextEventDefVideoPath.indexOf("view_video") > 0 ) ) { //on and staying with videojs
CurEventDefVideoPath = NextEventDefVideoPath; CurEventDefVideoPath = NextEventDefVideoPath;
eventQuery(nextEventId); eventQuery(nextEventId);
} else if ( zmsBroke || (vid && NextEventDefVideoPath.indexOf("view_video") < 0) || NextEventDefVideoPath.indexOf("view_video") > 0) {//reload zms, leaving vjs, moving to vjs } else if ( zmsBroke || (vid && NextEventDefVideoPath.indexOf("view_video") < 0) || NextEventDefVideoPath.indexOf("view_video") > 0) {//reload zms, leaving vjs, moving to vjs
location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery + '&popup='+popup); location.replace(thisUrl + '?view=event&eid=' + nextEventId + filterQuery + sortQuery);
} else { } else {
streamReq.send(streamParms+"&command="+CMD_NEXT); streamReq.send(streamParms+"&command="+CMD_NEXT);
streamPlay(); streamPlay();