Move getScreenSize from beef.browser to beef.hardware
This commit is contained in:
@@ -3972,17 +3972,6 @@ beef.browser = {
|
||||
return results;
|
||||
},
|
||||
|
||||
/**
|
||||
* Returns zombie screen size and color depth.
|
||||
*/
|
||||
getScreenSize: function () {
|
||||
return {
|
||||
width: window.screen.width,
|
||||
height: window.screen.height,
|
||||
colordepth: window.screen.colorDepth
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Returns zombie browser window size.
|
||||
* @from: http://www.howtocreate.co.uk/tutorials/javascript/browserwindow
|
||||
@@ -4047,7 +4036,7 @@ beef.browser = {
|
||||
else if (typeof value == 'object') return value;
|
||||
else return undefined;
|
||||
});
|
||||
var screen_size = beef.browser.getScreenSize();
|
||||
var screen_size = beef.hardware.getScreenSize();
|
||||
var window_size = beef.browser.getWindowSize();
|
||||
var vbscript_enabled = (beef.browser.hasVBScript()) ? "Yes" : "No";
|
||||
var has_flash = (beef.browser.hasFlash()) ? "Yes" : "No";
|
||||
|
||||
@@ -16,7 +16,7 @@ beef.browser.popup = {
|
||||
|
||||
blocker_enabled: function ()
|
||||
{
|
||||
screenParams = beef.browser.getScreenSize();
|
||||
screenParams = beef.hardware.getScreenSize();
|
||||
var popUp = window.open('/', 'windowName0', 'width=1, height=1, left='+screenParams.width+', top='+screenParams.height+', scrollbars, resizable');
|
||||
if (popUp == null || typeof(popUp)=='undefined') {
|
||||
return true;
|
||||
|
||||
@@ -37,6 +37,17 @@ beef.hardware = {
|
||||
return arch;
|
||||
},
|
||||
|
||||
/**
|
||||
* Returns zombie screen size and color depth.
|
||||
*/
|
||||
getScreenSize: function () {
|
||||
return {
|
||||
width: window.screen.width,
|
||||
height: window.screen.height,
|
||||
colordepth: window.screen.colorDepth
|
||||
}
|
||||
},
|
||||
|
||||
/*
|
||||
* @return: {Boolean} true or false.
|
||||
**/
|
||||
|
||||
Reference in New Issue
Block a user