Hiddenden/beef
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restore webkit checking. Additional comments.

Browse Source 
Added `isWebKitBased` function.
Due to who knows what version is being used -- this primarily checks for Safari.
Eliminating code duplication and bugs.

Corrected getBrowserVersion comment.

    modified:   core/main/client/browser.js
This commit is contained in:
Bucky Wilson
2018-01-08 09:44:59 +10:00
parent a2c097a47f
commit f92aed46c2
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/main/client/browser.js
View File

@@ -646,13 +646,24 @@ beef.browser = {
return this.isS4() || this.isS5() || this.isS6() || this.isS7() || this.isS8();
},
/**
* Returns true if Webkit based
*/
isWebKitBased: function () {
// Currently, [2018-01-08], safari checks isS* provide evidence of webkit
// to avoid duplicating code and hence bugs, use the existing checks for Safari.
return this.isS4() || this.isS5() || this.isS6() || this.isS7() || this.isS8();
},
/**
* Return true if Epiphany
* @example: beef.browser.isEpi()
*/
isEpi: function () {
// based on webkit -- therefore should look a bit like Safari
return window.navigator.userAgent.match(/Epiphany\//) != null;
// Epiphany is based on webkit
// due to the uncertainty of webkit version vs Epiphany versions tracking.
// -- do webkit based checking (i.e. do safari checks)
return this.isWebKitBased() && window.navigator.userAgent.match(/Epiphany\//) != null;
},
@@ -1669,8 +1680,8 @@ beef.browser = {
},
/**
* Returns the type of browser being used.
* @return: {String} User agent software and version.
* Returns the major version of the browser being used.
* @return: {String} version number || 'UNKNOWN'.
*
* @example: beef.browser.getBrowserVersion()
*/