ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'fix_popup' into storageareas

pull/1185/head
Isaac Connor 2016-10-11 12:19:38 -04:00
parent 743e8c59f9 ded1e0ea73
commit 0358476ac0
1 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -102,7 +102,12 @@ function getPopupSize( tag, width, height )
function zmWindow() function zmWindow()
{ {
var zmWin = window.open( 'http://www.zoneminder.com', 'ZoneMinder' ); var zmWin = window.open( 'http://www.zoneminder.com', 'ZoneMinder' );
zmWin.focus(); if ( ! zmWin ) {
// if popup blocking is enabled, the popup won't be defined.
console.log("Please disable popup blocking.");
} else {
zmWin.focus();
}
} }
function createPopup( url, name, tag, width, height ) function createPopup( url, name, tag, width, height )
@ -114,7 +119,12 @@ function createPopup( url, name, tag, width, height )
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 );
popup.focus(); if ( ! popup ) {
// if popup blocking is enabled, the popup won't be defined.
console.log("Please disable popup blocking.");
} else {
popup.focus();
}
} }
function createEventPopup( eventId, eventFilter, width, height ) function createEventPopup( eventId, eventFilter, width, height )
@ -125,7 +135,12 @@ function createEventPopup( eventId, eventFilter, width, height )
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 );
popup.focus(); if ( ! popup ) {
// if popup blocking is enabled, the popup won't be defined.
console.log("Please disable popup blocking.");
} else {
popup.focus();
}
} }
function createFramesPopup( eventId, width, height ) function createFramesPopup( eventId, width, height )
@ -134,7 +149,12 @@ function createFramesPopup( eventId, width, height )
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 );
popup.focus(); if ( ! popup ) {
// if popup blocking is enabled, the popup won't be defined.
console.log("Please disable popup blocking.");
} else {
popup.focus();
}
} }
function createFramePopup( eventId, frameId, width, height ) function createFramePopup( eventId, frameId, width, height )
@ -143,7 +163,12 @@ function createFramePopup( eventId, frameId, width, height )
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 );
popup.focus(); if ( ! popup ) {
// if popup blocking is enabled, the popup won't be defined.
console.log("Please disable popup blocking.");
} else {
popup.focus();
}
} }
function windowToFront() function windowToFront()