Skip to content

Commit 3b27ffd

Browse files
committed
Polish Safari rebase cleanup
1 parent 6ec7ee8 commit 3b27ffd

2 files changed

Lines changed: 11 additions & 4 deletions

File tree

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "macify",
33
"version": "2.2.0",
44
"private": true,
5-
"description": "Transform Safari or Chrome's new tab into a macOS aerial screensaver.",
5+
"description": "Transform Chrome's new tab into a macOS aerial screensaver.",
66
"license": "MIT",
77
"type": "module",
88
"scripts": {

src/lib/storage.js

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ export const cache = {
5959

6060
export const sessionCache = {
6161
area() {
62-
return chrome.storage.session;
62+
return chrome.storage?.session;
6363
},
6464
async get(keys) {
6565
const area = this.area();
@@ -69,10 +69,17 @@ export const sessionCache = {
6969
return Object.fromEntries(memorySession.entries());
7070
}
7171
const result = {};
72+
if (typeof keys === 'object' && !Array.isArray(keys)) {
73+
for (const [key, fallback] of Object.entries(keys)) {
74+
result[key] = memorySession.has(key) ? memorySession.get(key) : fallback;
75+
}
76+
return result;
77+
}
7278
const list = Array.isArray(keys) ? keys : [keys];
7379
for (const key of list) {
74-
const value = memorySession.get(key);
75-
if (value !== undefined) result[key] = value;
80+
if (memorySession.has(key)) {
81+
result[key] = memorySession.get(key);
82+
}
7683
}
7784
return result;
7885
},

0 commit comments

Comments
 (0)