Browse Source

Attempt to fix MacOS user agent.

pull/3202/head
TheGoddessInari 5 years ago
parent
commit
8871b6c33a
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
  1. 15
      app/ux/WebView.js

15
app/ux/WebView.js

@ -923,7 +923,7 @@ Ext.define('Hamsket.ux.WebView',{
platform = `X11; Linux ${me.getOSArch(platform)}`; platform = `X11; Linux ${me.getOSArch(platform)}`;
break; break;
case 'darwin': case 'darwin':
platform = `${me.getOSArchType()} Mac OS X ${me.getOSRelease(platform)}`; platform = `Macintosh; ${me.getOSArchType()} Mac OS X ${me.getOSRelease(platform)}`;
break; break;
case 'freebsd': case 'freebsd':
platform = `X11; FreeBSD ${me.getOSArch(platform)}`; platform = `X11; FreeBSD ${me.getOSArch(platform)}`;
@ -936,8 +936,13 @@ Ext.define('Hamsket.ux.WebView',{
} }
return platform; return platform;
} }
,isWindows() { ,isWindows(platform) {
return require('electron').remote.require('os').platform() === 'win32'; platform = platform ? platform : require('electron').remote.require('os').platform();
return platform === 'win32';
}
,isMac(platform) {
platform = platform ? platform : require('electron').remote.require('os').platform();
return platform === 'darwin';
} }
,is32bit() { ,is32bit() {
const arch = require('electron').remote.require('os').arch(); const arch = require('electron').remote.require('os').arch();
@ -957,7 +962,9 @@ Ext.define('Hamsket.ux.WebView',{
return remote.require('os').release().match(/([0-9]+\.[0-9]+)/)[0]; return remote.require('os').release().match(/([0-9]+\.[0-9]+)/)[0];
} }
} }
else { else if (me.isMac(platform)) {
return remote.require('os').release().split('.').join('_');
} else {
return remote.require('os').release(); return remote.require('os').release();
} }
} }

Loading…
Cancel
Save