infrastructure/blender-org
5
4
Fork 1
Code Issues 16 Pull Requests Projects Releases Wiki Activity

UI: Implement JavaScript getOS function Windows platform architecture detection #104136

Merged
Márton Lente merged 15 commits from get-os-win-arm into main 2024-11-08 12:03:41 +01:00
Conversation 2 Commits 15 Files Changed 2 +20 -7
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2925561134 - Show all commits

27
themes/bthree/assets/js/get_os.js
View File

@ -56,7 +56,16 @@ function getOS() {
function init() {
// Check if the browser method 'navigator.userAgentData' is supported
if (navigator.userAgentData && typeof navigator.userAgentData.getHighEntropyValues == 'function') {
return initAsync();
return (async function() {
try {
var value = await initAsync();
console.log(value);
// TODO: fix return returning undefined
return value;
} catch (error) {}
})();
} else {
return initSync();
}
@ -65,14 +74,17 @@ function getOS() {
// TODO: fix function async initAsync
// Create function initAsync for browsers that support navigator.userAgentData (e.g. Chromium-based browsers)
function initAsync() {
/* Code modified from Microsoft's website.
* https://learn.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11#sample-code-for-detecting-arm-or-x86
*/
navigator.userAgentData.getHighEntropyValues(["architecture", "bitness"])
.then(ua => {
return (async function() {
try {
// Init variable OS default
var OS = "windows";
/* Code modified from Microsoft's website.
* https://learn.microsoft.com/en-us/microsoft-edge/web-platform/how-to-detect-win11#sample-code-for-detecting-arm-or-x86
*/
// Wait for and get the high entropy values from async method
var ua = await navigator.userAgentData.getHighEntropyValues(["architecture", "bitness"]);
// Check if the platform is Windows
if (navigator.userAgentData.platform === "Windows") {
if (ua.architecture === 'arm') {
@ -88,7 +100,8 @@ function getOS() {
}
return OS;
});
} catch (e) {}
})();
}
// Create function initSync for browsers that don't support navigator.userAgentData (e.g. Gecko-based browsers)