From 30171693ffcae868c71939be75a5a83f1038cb15 Mon Sep 17 00:00:00 2001 From: bcoles Date: Fri, 1 Feb 2013 04:29:06 +1030 Subject: [PATCH] Add 'beef.hardware.isVirtualMachine()' Rename 'beef.hardware.getMobileName()' to 'beef.hardware.getName()' --- core/main/client/browser.js | 2 +- core/main/client/hardware.js | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/core/main/client/browser.js b/core/main/client/browser.js index c82ca82d5..7ffefd134 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -965,7 +965,7 @@ beef.browser = { var browser_plugins = beef.browser.getPlugins(); var date_stamp = new Date().toString(); var os_name = beef.os.getName(); - var hw_name = beef.hardware.getMobileName(); + var hw_name = beef.hardware.getName(); var system_platform = (typeof(navigator.platform) != "undefined" && navigator.platform != "") ? navigator.platform : null; var browser_type = JSON.stringify(beef.browser.type(), function (key, value) {if (value == true) return value; else if (typeof value == 'object') return value; else return;}); var screen_size = beef.browser.getScreenSize(); diff --git a/core/main/client/hardware.js b/core/main/client/hardware.js index 32732e5ec..dc9ae7a4c 100644 --- a/core/main/client/hardware.js +++ b/core/main/client/hardware.js @@ -8,6 +8,12 @@ beef.hardware = { ua: navigator.userAgent, + isVirtualMachine: function() { + var result = false; + if (screen.width % 2 || screen.height % 2) result = true; + return result; + }, + isNokia: function() { return (this.ua.match('(Maemo Browser)|(Symbian)|(Nokia)')) ? true : false; }, @@ -36,13 +42,13 @@ beef.hardware = { * Returns true if the browser is on a Mobile Phone * @return: {Boolean} true or false * - * @example: if(beef.browser.isMobilePhone()) { ... } + * @example: if(beef.hardware.isMobilePhone()) { ... } **/ isMobilePhone: function() { return DetectMobileQuick(); }, - getMobileName: function() { + getName: function() { var ua = navigator.userAgent.toLowerCase(); if(DetectIphone()) { return "iPhone"}; if(DetectIpod()) { return "iPod Touch"}; @@ -78,11 +84,12 @@ beef.hardware = { if(DetectSonyMylo()) { return "Sony Mylo"}; if(DetectAmazonSilk()) { return "Kindle Fire"}; if(DetectKindle()) { return "Kindle"}; - if(DetectSonyPlaystation()) { return "Playstation" }; + if(DetectSonyPlaystation()) { return "Playstation"}; if(ua.search(deviceNintendoDs) > -1) { return "Nintendo DS"}; if(ua.search(deviceWii) > -1) { return "Nintendo Wii"}; if(ua.search(deviceNintendo) > -1) { return "Nintendo"}; if(DetectXbox()) { return "Xbox"}; + if(this.isVirtualMachine()) { return "Virtual Machine"}; return 'Unknown'; }