Skip to content

Fix screen size calculation when device context is not set #55

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

Open
wants to merge 1 commit into
base: release/1.7
Choose a base branch
from
Open

Fix screen size calculation when device context is not set #55

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 11 additions & 2 deletions Sdl.Web.Mvc/Configuration/WebRequestContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,11 @@ public static int MaxMediaWidth
{
//Pixel Ratio can be non-integer value (if zoom is applied to browser) - so we use a min of 1, and otherwise round when calculating max width
double pixelRatio = ContextEngine.GetClaims<DeviceClaims>().PixelRatio;
int displayWidth = IsContextCookiePresent ? ContextEngine.GetClaims<BrowserClaims>().DisplayWidth : 1024;
int displayWidth = IsContextCookiePresent ? ContextEngine.GetClaims<BrowserClaims>().DisplayWidth : 0;
if (displayWidth == 0)
{
displayWidth = 1024;
}
return (int?)GetFromContextStore("MaxMediaWidth") ?? (int)AddToContextStore("MaxMediaWidth", Convert.ToInt32(Math.Max(1.0, pixelRatio) * Math.Min(displayWidth, _maxWidth)));
}
}
Expand Down Expand Up @@ -189,7 +193,12 @@ public static bool IsInclude

protected static ScreenWidth CalculateScreenWidth()
{
int width = IsContextCookiePresent ? ContextEngine.GetClaims<BrowserClaims>().DisplayWidth : 1024;
int width = IsContextCookiePresent ? ContextEngine.GetClaims<BrowserClaims>().DisplayWidth : 0;
if (width == 0)
{
width = 1024;
}

if (width < SiteConfiguration.MediaHelper.SmallScreenBreakpoint)
{
return ScreenWidth.ExtraSmall;
Expand Down