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
2 changed files with 34 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -510,7 +510,6 @@ 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) {
@@ -525,7 +524,6 @@ export default SiteHeaderComponent.extend({
}); });
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) {

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

@@ -3,13 +3,10 @@ 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");
site.set("narrowDesktopView", NarrowDesktop.narrowDesktopView);
this._resizeObserver = new ResizeObserver((entries) => { this._resizeObserver = new ResizeObserver((entries) => {
if (owner.isDestroyed) { if (owner.isDestroyed) {
return; return;
@@ -20,22 +17,17 @@ export default {
entry.contentRect.width entry.contentRect.width
); );
if (oldNarrowDesktopView !== newNarrowDesktopView) { if (oldNarrowDesktopView !== newNarrowDesktopView) {
const applicationController = owner.lookup( const applicationController = owner.lookup("controller:application");
"controller:application"
);
site.set("narrowDesktopView", newNarrowDesktopView); site.set("narrowDesktopView", newNarrowDesktopView);
applicationController.set( applicationController.set(
"showSidebar", "showSidebar",
applicationController.calculateShowSidebar() applicationController.calculateShowSidebar()
); );
applicationController.appEvents.trigger( applicationController.appEvents.trigger("site-header:force-refresh");
"site-header:force-refresh"
);
} }
} }
}); });
this._resizeObserver.observe(document.body); this._resizeObserver.observe(document.body);
}
}, },
}; };