mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Move platform setting to its own thing

Browse source
This commit is contained in:
David Baker 2016-10-24 15:12:16 +01:00
parent f62f2e8f25
commit 7b4694c637
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/vector/index.js
View file

@ -46,6 +46,7 @@ if (process.env.NODE_ENV !== 'production') {
var RunModernizrTests = require("./modernizr"); // this side-effects a global var RunModernizrTests = require("./modernizr"); // this side-effects a global
var ReactDOM = require("react-dom"); var ReactDOM = require("react-dom");
var sdk = require("matrix-react-sdk"); var sdk = require("matrix-react-sdk");
var PlatformPeg = require("matrix-react-sdk/lib/PlatformPeg");
sdk.loadSkin(require('../component-index')); sdk.loadSkin(require('../component-index'));
var VectorConferenceHandler = require('../VectorConferenceHandler'); var VectorConferenceHandler = require('../VectorConferenceHandler');
var UpdateChecker = require("./updater"); var UpdateChecker = require("./updater");
@ -209,7 +210,9 @@ function onLoadCompleted() {
async function loadApp() { async function loadApp() {
const fragparts = parseQsFromFragment(window.location); const fragparts = parseQsFromFragment(window.location);
const params = parseQs(window.location); const params = parseQs(window.location);
const platform = new Platform();
// set the platform for react sdk (our Platform object automatically picks the right one)
PlatformPeg.set(new Platform());
// don't try to redirect to the native apps if we're // don't try to redirect to the native apps if we're
// verifying a 3pid // verifying a 3pid
@ -263,7 +266,6 @@ async function loadApp() {
enableGuest={true} enableGuest={true}
onLoadCompleted={onLoadCompleted} onLoadCompleted={onLoadCompleted}
defaultDeviceDisplayName={getDefaultDeviceDisplayName()} defaultDeviceDisplayName={getDefaultDeviceDisplayName()}
platform={platform}
/>, />,
document.getElementById('matrixchat') document.getElementById('matrixchat')
); );