OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'jryans/device-name' into 'element' 

Use a safe but sane device name

See merge request new-vector/element/element-web/element-web!10
jryans/restore-device-name
J. Ryan Stinnett 2020-07-14 20:56:11 +00:00
parent 225d2ad931 0fa2941188
commit 1d90820b10
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/vector/platform/WebPlatform.ts
View File

@ -173,20 +173,21 @@ export default class WebPlatform extends VectorBasePlatform {
} }
getDefaultDeviceDisplayName(): string { getDefaultDeviceDisplayName(): string {
return "unknown browser " + Math.round(Number.MAX_SAFE_INTEGER * Math.random()); // TODO: Revert this after launch
// // strip query-string and fragment from uri
// const u = url.parse(window.location.href);
// u.protocol = "";
// u.search = "";
// u.hash = "";
// // Remove trailing slash if present
// u.pathname = u.pathname.replace(/\/$/, "");
// strip query-string and fragment from uri // let appName = u.format();
const u = url.parse(window.location.href); // // Remove leading slashes if present
u.protocol = ""; // appName = appName.replace(/^\/\//, "");
u.search = ""; // // `appName` is now in the format `develop.element.io`.
u.hash = "";
// Remove trailing slash if present
u.pathname = u.pathname.replace(/\/$/, "");
let appName = u.format(); const appName = "Riot Web";
// Remove leading slashes if present
appName = appName.replace(/^\/\//, "");
// `appName` is now in the format `develop.element.io`.
const ua = new UAParser(); const ua = new UAParser();
const browserName = ua.getBrowser().name || "unknown browser"; const browserName = ua.getBrowser().name || "unknown browser";