Skip to content

Commit c0c5ea0

Browse files
committed
Refactoring for MacOS detection
1 parent 05ce61c commit c0c5ea0

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/js/protocols/WebSerial.js

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { webSerialDevices, vendorIdNames } from "./devices";
22
import { checkBrowserCompatibility } from "../utils/checkBrowserCompatibilty";
3+
import { GUI } from "../gui";
34

45
const logHead = "[SERIAL]";
56

@@ -333,7 +334,7 @@ class WebSerial extends EventTarget {
333334
}
334335

335336
checkIsNeedBatchWrite() {
336-
const isMac = /macintosh|mac os x/i.test(navigator.userAgent);
337+
const isMac = GUI.operating_system === "MacOS";
337338
return isMac && vendorIdNames[this.connectionInfo.usbVendorId] === "AT32";
338339
}
339340

src/js/utils/checkBrowserCompatibilty.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ export function getOS() {
66
let os = "unknown";
77
const userAgent = window.navigator.userAgent;
88
const platform = window.navigator?.userAgentData?.platform || window.navigator.platform;
9-
const macosPlatforms = ["Macintosh", "MacIntel", "MacPPC", "Mac68K", "MacOS"];
9+
const macosPlatforms = ["Macintosh", "MacIntel", "MacPPC", "Mac68K", "macOS"];
1010
const windowsPlatforms = ["Win32", "Win64", "Windows", "WinCE"];
1111
const iosPlatforms = ["iPhone", "iPad", "iPod"];
1212

0 commit comments

Comments
 (0)