Move getScreenSize from beef.browser to beef.hardware

This commit is contained in:
Brendan Coles
2019-02-09 11:23:18 +00:00
parent 5bce57854b
commit 3108653c69
3 changed files with 13 additions and 13 deletions

View File

@@ -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";

View File

@@ -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;

View File

@@ -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.
**/