Move getDefaultDeviceName into the Platforms

So we can have a sensible device name on Electron
This commit is contained in:
David Baker 2016-11-24 16:46:15 +00:00
parent 47534decb3
commit c786980454
4 changed files with 49 additions and 15 deletions

View file

@ -54,7 +54,6 @@ var UpdateChecker = require("./updater");
var q = require('q');
var request = require('browser-request');
import UAParser from 'ua-parser-js';
import url from 'url';
import {parseQs, parseQsFromFragment} from './url_utils';
@ -144,19 +143,6 @@ var makeRegistrationUrl = function() {
'#/register';
}
function getDefaultDeviceDisplayName() {
// strip query-string and fragment from uri
let u = url.parse(window.location.href);
u.search = "";
u.hash = "";
let app_name = u.format();
let ua = new UAParser();
return app_name + " via " + ua.getBrowser().name +
" on " + ua.getOS().name;
}
window.addEventListener('hashchange', onHashChange);
function getConfig() {
@ -262,7 +248,7 @@ async function loadApp() {
startingFragmentQueryParams={fragparts.params}
enableGuest={true}
onLoadCompleted={onLoadCompleted}
defaultDeviceDisplayName={getDefaultDeviceDisplayName()}
defaultDeviceDisplayName={PlatformPeg.get().getDefaultDeviceDisplayName()}
/>,
document.getElementById('matrixchat')
);