IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Don't check for ResizeObserver existence (#25419)

Browse Source 
We already assume it's there in many other places
This commit is contained in:
Jarek Radosz 2024-01-25 13:47:15 +01:00 committed by GitHub
parent 241eaadc26
commit 4d1ed4a62d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 34 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
app/assets/javascripts/discourse/app/components/site-header.js
View File

@ -510,22 +510,20 @@ export default SiteHeaderComponent.extend({
}); });
} }
if ("ResizeObserver" in window) { this._resizeObserver = new ResizeObserver((entries) => {
this._resizeObserver = new ResizeObserver((entries) => { for (let entry of entries) {
for (let entry of entries) { if (entry.contentRect) {
if (entry.contentRect) { const headerTop = this.header?.offsetTop;
const headerTop = this.header?.offsetTop; document.documentElement.style.setProperty(
document.documentElement.style.setProperty( "--header-top",
"--header-top", `${headerTop}px`
`${headerTop}px` );
); this.updateHeaderOffset();
this.updateHeaderOffset();
}
} }
}); }
});
this._resizeObserver.observe(this.headerWrap); this._resizeObserver.observe(this.headerWrap);
}
this._swipeEvents = new SwipeEvents(this.element); this._swipeEvents = new SwipeEvents(this.element);
if (this.site.mobileView) { if (this.site.mobileView) {

52
app/assets/javascripts/discourse/app/instance-initializers/narrow-desktop.js
View File

@ -3,39 +3,31 @@ import NarrowDesktop from "discourse/lib/narrow-desktop";
export default { export default {
initialize(owner) { initialize(owner) {
NarrowDesktop.init(); NarrowDesktop.init();
let site;
if (!owner.isDestroyed) {
site = owner.lookup("service:site");
site.set("narrowDesktopView", NarrowDesktop.narrowDesktopView);
}
if ("ResizeObserver" in window) { const site = owner.lookup("service:site");
this._resizeObserver = new ResizeObserver((entries) => { site.set("narrowDesktopView", NarrowDesktop.narrowDesktopView);
if (owner.isDestroyed) {
return; this._resizeObserver = new ResizeObserver((entries) => {
} if (owner.isDestroyed) {
for (let entry of entries) { return;
const oldNarrowDesktopView = site.narrowDesktopView; }
const newNarrowDesktopView = NarrowDesktop.isNarrowDesktopView( for (let entry of entries) {
entry.contentRect.width const oldNarrowDesktopView = site.narrowDesktopView;
const newNarrowDesktopView = NarrowDesktop.isNarrowDesktopView(
entry.contentRect.width
);
if (oldNarrowDesktopView !== newNarrowDesktopView) {
const applicationController = owner.lookup("controller:application");
site.set("narrowDesktopView", newNarrowDesktopView);
applicationController.set(
"showSidebar",
applicationController.calculateShowSidebar()
); );
if (oldNarrowDesktopView !== newNarrowDesktopView) { applicationController.appEvents.trigger("site-header:force-refresh");
const applicationController = owner.lookup(
"controller:application"
);
site.set("narrowDesktopView", newNarrowDesktopView);
applicationController.set(
"showSidebar",
applicationController.calculateShowSidebar()
);
applicationController.appEvents.trigger(
"site-header:force-refresh"
);
}
} }
}); }
});
this._resizeObserver.observe(document.body); this._resizeObserver.observe(document.body);
}
}, },
}; };