Skip to content
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

Dimension fix #23

Merged
merged 5 commits into from
Dec 9, 2024
Merged

Dimension fix #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e4f8e3
Dimension fix
turtledreams Dec 9, 2024
f8968cd
res
turtledreams Dec 9, 2024
6ad48ec
precision
turtledreams Dec 9, 2024
0b0c4df
timer
turtledreams Dec 9, 2024
b434825
changelog
turtledreams Dec 9, 2024
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
6 changes: 6 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 24.11.2

* Added a new init method to set the interval of Content Zone's timer (Experimental!):
* `content_zone_timer_interval` to set the timer interval in `seconds`
* Mitigated an issue about Content's positioning (Experimental!)

## 24.11.1

* Deprecated `initializeRatingWidgets` method, use `feedback.showRating` instead.
Expand Down
65 changes: 43 additions & 22 deletions modules/CountlyClass.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ class CountlyClass {
#contentEndPoint;
#inContentZone;
#contentZoneTimer;
#contentZoneTimerInterval;
#contentIframeID;
constructor(ob) {
this.#self = this;
Expand Down Expand Up @@ -216,6 +217,11 @@ constructor(ob) {
this.hcWarningCount = this.#getValueFromStorage(healthCheckCounterEnum.warningCount) || 0;
this.hcStatusCode = this.#getValueFromStorage(healthCheckCounterEnum.statusCode) || -1;
this.hcErrorMessage = this.#getValueFromStorage(healthCheckCounterEnum.errorMessage) || "";
this.#contentZoneTimerInterval = getConfig("content_zone_timer_interval", ob, null);

if (this.#contentZoneTimerInterval) {
this.#contentTimeInterval = Math.max(this.#contentZoneTimerInterval, 15) * 1000;
}

if (this.#maxCrashLogs && !this.maxBreadcrumbCount) {
this.maxBreadcrumbCount = this.#maxCrashLogs;
Expand Down Expand Up @@ -419,6 +425,9 @@ constructor(ob) {
if (this.#remoteConfigs) {
this.#log(logLevelEnums.DEBUG, "initialize, stored remote configs:[" + JSON.stringify(this.#remoteConfigs) + "]");
}
if (this.#contentZoneTimerInterval) {
this.#log(logLevelEnums.DEBUG, "initialize, content_zone_timer_interval:[" + this.#contentZoneTimerInterval + "]");
}
// functions, if provided, would be printed as true without revealing their content
this.#log(logLevelEnums.DEBUG, "initialize, 'getViewName' callback override provided:[" + (this.getViewName !== Countly.getViewName) + "]");
this.#log(logLevelEnums.DEBUG, "initialize, 'getSearchQuery' callback override provided:[" + (this.getSearchQuery !== Countly.getSearchQuery) + "]");
Expand Down Expand Up @@ -3679,12 +3688,14 @@ constructor(ob) {

#prepareContentRequest = () => {
this.#log(logLevelEnums.DEBUG, "prepareContentRequest, forming content request");
const resInfo = this.#getResolution();
const resInfo = this.#getResolution(true);
var resToSend = {l : {}, p: {}};
resToSend.l.w = resInfo.width;
resToSend.l.h = resInfo.height;
resToSend.p.w = resInfo.height;
resToSend.p.h = resInfo.width;
const lWidthPHeight = Math.max(resInfo.width, resInfo.height);
const lHeightPWidth = Math.min(resInfo.width, resInfo.height);
resToSend.l.w = lWidthPHeight;
resToSend.l.h = lHeightPWidth;
resToSend.p.w = lHeightPWidth;
resToSend.p.h = lWidthPHeight;

const local = navigator.language || navigator.browserLanguage || navigator.systemLanguage || navigator.userLanguage;
const language = local.split('-')[0];
Expand Down Expand Up @@ -3728,10 +3739,15 @@ constructor(ob) {
iframe.id = this.#contentIframeID;
iframe.src = response.html;
iframe.style.position = "absolute";
iframe.style.left = response.geo.l.x + "px";
iframe.style.top = response.geo.l.y + "px";
iframe.style.width = response.geo.l.w + "px";
iframe.style.height = response.geo.l.h + "px";
var dimensionToUse = response.geo.p;
const resInfo = this.#getResolution(true);
if (resInfo.width >= resInfo.height) {
dimensionToUse = response.geo.l;
};
iframe.style.left = dimensionToUse.x + "px";
iframe.style.top = dimensionToUse.y + "px";
iframe.style.width = dimensionToUse.w + "px";
iframe.style.height = dimensionToUse.h + "px";
iframe.style.border = "none";
iframe.style.zIndex = "999999";
document.body.appendChild(iframe);
Expand Down Expand Up @@ -4243,10 +4259,10 @@ constructor(ob) {

/**
* returns the resolution of the device
* @param {bool} getAvailable - get available resolution
* @param {bool} getViewPort - get viewport
* @returns {object} resolution object: {width: 1920, height: 1080, orientation: 0}
*/
#getResolution = (getAvailable) => {
#getResolution = (getViewPort) => {
this.#log(logLevelEnums.DEBUG, "Getting the resolution of the device");
if (!isBrowser || !screen) {
this.#log(logLevelEnums.DEBUG, "No screen available");
Expand All @@ -4256,9 +4272,16 @@ constructor(ob) {
var width = (screen.width) ? parseInt(screen.width) : 0;
var height = (screen.height) ? parseInt(screen.height) : 0;

if (getAvailable) {
width = (screen.availWidth) ? parseInt(screen.availWidth) : width;
height = (screen.availHeight) ? parseInt(screen.availHeight) : height;
if (getViewPort) {
const viewportWidth = window.innerWidth;
const viewportHeight = window.innerHeight;
const layoutWidth = document.documentElement.clientWidth;
const layoutHeight = document.documentElement.clientHeight;
const visibleWidth = Math.min(viewportWidth, layoutWidth);
const visibleHeight = Math.min(viewportHeight, layoutHeight);

width = visibleWidth ? parseInt(visibleWidth) : width;
height = visibleHeight ? parseInt(visibleHeight) : height;
}

if (width === 0 || height === 0) {
Expand All @@ -4267,18 +4290,16 @@ constructor(ob) {
}
var iOS = !!navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform);
if (iOS && window.devicePixelRatio) {
this.#log(logLevelEnums.VERBOSE, "Mobile Mac device detected, adjusting resolution");
// ios provides dips, need to multiply
width = Math.round(width * window.devicePixelRatio);
height = Math.round(height * window.devicePixelRatio);
}
else {
if (Math.abs(screen.orientation.angle) === 90) {
// we have landscape orientation
// switch values for all except ios
var temp = width;
width = height;
height = temp;
}
if (Math.abs(screen.orientation.angle) === 90) {
this.#log(logLevelEnums.VERBOSE, "Screen is in landscape mode, adjusting resolution");
var temp = width;
width = height;
height = temp;
}
return { width: width, height: height , orientation: screen.orientation.angle };
};
Expand Down
Loading