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

console.js - change all createPopup to window.location.assign

This commit is contained in:
Andrew Bauer 2020-08-28 07:58:42 -05:00
parent a288a54fbe
commit 2b6090d8c6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/skins/classic/views/js/console.js
View File

@ -53,7 +53,7 @@ function setButtonStates( element ) {
}
function addMonitor(element) {
createPopup( '?view=monitor', 'zmMonitor0', 'monitor' );
window.location.assign('?view=monitor');
}
function cloneMonitor(element) {
@ -73,7 +73,7 @@ function cloneMonitor(element) {
}
} // end foreach element
if ( monitorId != -1 ) {
createPopup( '?view=monitor&dupId='+monitorId, 'zmMonitor0', 'monitor' );
window.location.assign('?view=monitor&dupId='+monitorId);
}
}
@ -97,11 +97,11 @@ function editMonitor( element ) {
}
} // end foreach checkboxes
if ( monitorIds.length == 1 ) {
createPopup( '?view=monitor&mid='+monitorIds[0], 'zmMonitor'+monitorIds[0], 'monitor' );
window.location.assign('?view=monitor&mid='+monitorIds[0]);
} else if ( monitorIds.length > 1 ) {
createPopup( '?view=monitors&'+(monitorIds.map(function(mid) {
window.location.assign( '?view=monitors&'+(monitorIds.map(function(mid) {
return 'mids[]='+mid;
}).join('&')), 'zmMonitors', 'monitors' );
}).join('&')));
}
}
@ -147,7 +147,7 @@ function initPage() {
reloadWindow.periodical(consoleRefreshTimeout);
if ( showVersionPopup ) {
createPopup('?view=version', 'zmVersion', 'version');
window.location.assign('?view=version');
}
if ( showDonatePopup ) {
$j('#donate').modal('show');