Merge branch 'jryans/restore-device-name' into 'element'
Restore device name See merge request new-vector/element/element-web/element-web!11element
						commit
						4ec679aaed
					
				|  | @ -173,21 +173,18 @@ export default class WebPlatform extends VectorBasePlatform { | |||
|     } | ||||
| 
 | ||||
|     getDefaultDeviceDisplayName(): string { | ||||
|         // 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
 | ||||
|         const u = url.parse(window.location.href); | ||||
|         u.protocol = ""; | ||||
|         u.search = ""; | ||||
|         u.hash = ""; | ||||
|         // Remove trailing slash if present
 | ||||
|         u.pathname = u.pathname.replace(/\/$/, ""); | ||||
| 
 | ||||
|         // let appName = u.format();
 | ||||
|         // // Remove leading slashes if present
 | ||||
|         // appName = appName.replace(/^\/\//, "");
 | ||||
|         // // `appName` is now in the format `develop.element.io`.
 | ||||
| 
 | ||||
|         const appName = "Riot Web"; | ||||
|         let appName = u.format(); | ||||
|         // Remove leading slashes if present
 | ||||
|         appName = appName.replace(/^\/\//, ""); | ||||
|         // `appName` is now in the format `develop.element.io`.
 | ||||
| 
 | ||||
|         const ua = new UAParser(); | ||||
|         const browserName = ua.getBrowser().name || "unknown browser"; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 J. Ryan Stinnett
						J. Ryan Stinnett