Skip to content

Edge UserAgent support for BrowserId and BrowserVersion functions #590

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jul 6, 2022
Merged

Edge UserAgent support for BrowserId and BrowserVersion functions #590

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9359535
GXOfiice setDate applies default format (m/d/yy h:mm) only when the c…
elizondogenexus May 20, 2022
3bc3731
Gxoffice autofit now checks all rows to get the total columns being u…
elizondogenexus May 20, 2022
9c7433a
Unit test for GXoffice for testing Autofit and Formats of cells with …
elizondogenexus May 24, 2022
ae31bcb
Merge branch 'master' of https://github.com/genexuslabs/JavaClasses
elizondogenexus Jul 4, 2022
4281ac9
issue72284 change the order user-agent is read because user-agent end…
elizondogenexus Jul 4, 2022
b51ceca
change to recognize edg/edge/edgA/edgios as ID of edge browser in use…
elizondogenexus Jul 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions java/src/main/java/com/genexus/webpanels/HttpContextWeb.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ public class HttpContextWeb extends HttpContext {

private static final Pattern MULTIMEDIA_GXI_GRID_PATTERN = Pattern.compile("(\\w+)(_\\d{4})$");

private static final Pattern EDGE_BROWSER_VERSION_REGEX = Pattern.compile(" Edge\\/([0-9]+)\\.",
private static final Pattern EDGE_BROWSER_VERSION_REGEX = Pattern.compile(" Edg[\\w]{0,3}\\/([0-9]+)\\.",
Pattern.CASE_INSENSITIVE);
private static final String GXEVENT_PARM = "gxevent";

Expand Down Expand Up @@ -661,12 +661,12 @@ public int getBrowserType() {
String userAgent = request.getHeader("USER-AGENT");

if (userAgent != null) {
if (userAgent.toUpperCase().indexOf("CHROME") != -1) {
if ((userAgent.indexOf("Edg") ) != -1) {
return BROWSER_EDGE;
} else if (userAgent.toUpperCase().indexOf("CHROME") != -1) {
return BROWSER_CHROME;
} else if (userAgent.toUpperCase().indexOf("FIREFOX") != -1) {
return BROWSER_FIREFOX;
} else if ((userAgent.indexOf("Edge")) != -1) {
return BROWSER_EDGE;
} else if ((userAgent.indexOf("MSIE")) != -1) {
if ((userAgent.indexOf("Windows CE")) != -1)
return BROWSER_POCKET_IE;
Expand Down