diff --git a/core/main/client/browser.js b/core/main/client/browser.js index 8a0078e4f..26ad92246 100644 --- a/core/main/client/browser.js +++ b/core/main/client/browser.js @@ -958,29 +958,13 @@ beef.browser = { }, /** - * Returns true if Chrome 42. (adds !!window.fetch check too) + * Returns true if Chrome 42. * @example: beef.browser.isC42() */ isC42: function () { return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 42) ? true : false); }, - /** - * Returns true if Chrome 43.(adds !!window.fetch check too) - * @example: beef.browser.isC43() - */ - isC43: function () { - return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 43) ? true : false); - }, - - /** - * Returns true if Chrome 44.(adds !!window.fetch check too) - * @example: beef.browser.isC44() - */ - isC44: function () { - return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 44) ? true : false); - }, - /** * Returns true if Chrome for iOS 42. * @example: beef.browser.isC42iOS() @@ -989,12 +973,36 @@ beef.browser = { return (!window.webkitPerformance && window.navigator.appVersion.match(/CriOS\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/CriOS\/(\d+)\./)[1], 10) == 42) ? true : false); }, + /** + * Returns true if Chrome 43. + * @example: beef.browser.isC43() + */ + isC43: function () { + return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 43) ? true : false); + }, + + /** + * Returns true if Chrome 44. + * @example: beef.browser.isC44() + */ + isC44: function () { + return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 44) ? true : false); + }, + + /** + * Returns true if Chrome 45. + * @example: beef.browser.isC45() + */ + isC45: function () { + return (!!window.chrome && !!window.fetch && !window.webkitPerformance && window.navigator.appVersion.match(/Chrome\/(\d+)\./)) && ((parseInt(window.navigator.appVersion.match(/Chrome\/(\d+)\./)[1], 10) == 45) ? true : false); + }, + /** * Returns true if Chrome. * @example: beef.browser.isC() */ isC: function () { - return this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15() || this.isC16() || this.isC17() || this.isC18() || this.isC19() || this.isC19iOS() || this.isC20() || this.isC20iOS() || this.isC21() || this.isC21iOS() || this.isC22() || this.isC22iOS() || this.isC23() || this.isC23iOS() || this.isC24() || this.isC24iOS() || this.isC25() || this.isC25iOS() || this.isC26() || this.isC26iOS() || this.isC27() || this.isC27iOS() || this.isC28() || this.isC28iOS() || this.isC29() || this.isC29iOS() || this.isC30() || this.isC30iOS() || this.isC31() || this.isC31iOS() || this.isC32() || this.isC32iOS() || this.isC33() || this.isC33iOS() || this.isC34() || this.isC34iOS() || this.isC35() || this.isC35iOS() || this.isC36() || this.isC36iOS() || this.isC37() || this.isC37iOS() || this.isC38() || this.isC38iOS() || this.isC39() || this.isC39iOS() || this.isC40() || this.isC40iOS() || this.isC41() || this.isC41iOS() || this.isC42() || this.isC43() ||this.isC44() || this.isC42iOS(); + return this.isC5() || this.isC6() || this.isC7() || this.isC8() || this.isC9() || this.isC10() || this.isC11() || this.isC12() || this.isC13() || this.isC14() || this.isC15() || this.isC16() || this.isC17() || this.isC18() || this.isC19() || this.isC19iOS() || this.isC20() || this.isC20iOS() || this.isC21() || this.isC21iOS() || this.isC22() || this.isC22iOS() || this.isC23() || this.isC23iOS() || this.isC24() || this.isC24iOS() || this.isC25() || this.isC25iOS() || this.isC26() || this.isC26iOS() || this.isC27() || this.isC27iOS() || this.isC28() || this.isC28iOS() || this.isC29() || this.isC29iOS() || this.isC30() || this.isC30iOS() || this.isC31() || this.isC31iOS() || this.isC32() || this.isC32iOS() || this.isC33() || this.isC33iOS() || this.isC34() || this.isC34iOS() || this.isC35() || this.isC35iOS() || this.isC36() || this.isC36iOS() || this.isC37() || this.isC37iOS() || this.isC38() || this.isC38iOS() || this.isC39() || this.isC39iOS() || this.isC40() || this.isC40iOS() || this.isC41() || this.isC41iOS() || this.isC42() || this.isC42iOS() || this.isC43() ||this.isC44() || this.isC45(); }, /** @@ -1128,9 +1136,10 @@ beef.browser = { C41: this.isC41(), // Chrome 41 C41iOS: this.isC41iOS(), // Chrome 41 on iOS C42: this.isC42(), // Chrome 42 + C42iOS: this.isC42iOS(), // Chrome 42 on iOS C43: this.isC43(), // Chrome 43 C44: this.isC44(), // Chrome 44 - C42iOS: this.isC42iOS(), // Chrome 42 on iOS + C45: this.isC45(), // Chrome 45 C: this.isC(), // Chrome any version @@ -1453,18 +1462,22 @@ beef.browser = { return '42' } ; // Chrome 42 - if (this.isC43()) { - return '43' - } - ; - if (this.isC44()) { - return '44' - } - ; if (this.isC42iOS()) { return '42' } ; // Chrome 42 for iOS + if (this.isC43()) { + return '43' + } + ; // Chrome 43 + if (this.isC44()) { + return '44' + } + ; // Chrome 44 + if (this.isC45()) { + return '45' + } + ; // Chrome 45 if (this.isFF2()) { return '2'