Merge branch 'master' of https://github.com/meeseOS/meeseOS

meese-os · Sep 26, 2023 · 95754c3 · 95754c3
2 parents bff5202 + b0bd7d0
commit 95754c3
Show file tree

Hide file tree

Showing 8 changed files with 10 additions and 11 deletions.
diff --git a/apps/old-site/serviceWorker.js b/apps/old-site/serviceWorker.js
@@ -75,7 +75,7 @@ function registerValidSW(swUrl, config) {
 							);
 
 							// Execute callback
-							if (config && config.onUpdate) {
+							if (config?.onUpdate) {
 								config.onUpdate(registration);
 							}
 						} else {
@@ -85,7 +85,7 @@ function registerValidSW(swUrl, config) {
 							console.log("Content is cached for offline use.");
 
 							// Execute callback
-							if (config && config.onSuccess) {
+							if (config?.onSuccess) {
 								config.onSuccess(registration);
 							}
 						}

diff --git a/apps/old-site/src/components/home/MainBody.jsx b/apps/old-site/src/components/home/MainBody.jsx
@@ -47,8 +47,7 @@ const MainBody = () => {
 				</h1>
 				<TypingAnimation />
 				<div className="p-5" id="socialIcons">
-					{icons &&
-						icons.map((icon) => (
+					{icons?.map((icon) => (
 							<a
 								key={icon.id}
 								target="_blank"

diff --git a/backend/event-emitter/index.js b/backend/event-emitter/index.js
@@ -161,7 +161,7 @@ export class EventEmitter {
 						console.warn(e);
 					}
 
-					if (options && options.once) {
+					if (options?.once) {
 						this.events[n].splice(i, 1);
 					}
 				}

diff --git a/backend/server/src/filesystem.js b/backend/server/src/filesystem.js
@@ -268,7 +268,7 @@ class Filesystem {
 	async unmount(mountpoint) {
 		const found = this.watches.find((w) => w.id === mountpoint.id);
 
-		if (found && found.watch) {
+		if (found?.watch) {
 			await found.watch.close();
 		}
 

diff --git a/backend/server/src/vfs.js b/backend/server/src/vfs.js
@@ -129,7 +129,7 @@ const createMiddleware = (core) => {
 
 const createOptions = (req) => {
 	const options = req.fields.options;
-	const range = req.headers && req.headers.range;
+	const range = req.headers?.range;
 	const session = { ...(req.session || {}) };
 	let result = options || {};
 

diff --git a/frontend/client/src/search.js b/frontend/client/src/search.js
@@ -154,7 +154,7 @@ export default class Search {
 		if (this.ui) {
 			const win = Window.lastWindow();
 
-			this.focusLastWindow = win && win.blur();
+			this.focusLastWindow = win?.blur();
 
 			this.ui.emit("toggle", true);
 			setTimeout(() => this.focus(), 1);

diff --git a/frontend/client/src/utils/windows.js b/frontend/client/src/utils/windows.js
@@ -388,7 +388,7 @@ export const getCascadePosition = (win, rect, pos) => {
 };
 
 const getScreenOrientation = (screen) =>
-	screen && screen.orientation
+	screen?.orientation
 		? screen.orientation.type
 		: window.matchMedia("(orientation: portrait)")
 			? "portrait"
@@ -430,7 +430,7 @@ export const loadOptionsFromConfig = (config, appName, windowId) => {
 		return true;
 	});
 
-	const foundOptions = found && found.options ? found.options : {};
+	const foundOptions = found?.options ? found.options : {};
 	const allowedProperties = ["position", "dimension", "attributes"];
 
 	return allowedProperties.reduce(

diff --git a/frontend/widgets/src/widget.js b/frontend/widgets/src/widget.js
@@ -239,7 +239,7 @@ export default class Widget {
 			this.dialog.destroy();
 		}
 
-		if (this.$element && this.$element.parentNode) {
+		if (this.$element?.parentNode) {
 			this.$element.remove();
 		}