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

Merge remote-tracking branch 'origin/develop' into dbkr/wasm

Browse source
This commit is contained in:
David Baker 2018-10-05 14:04:43 +01:00
commit e277d02f83
5 changed files with 23 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/vector/index.html
View file

@ -81,6 +81,6 @@
</audio>
<audio id="remoteAudio"></audio>
<!-- let CSS themes pass constants to the app -->
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"/></div><div id="mx_theme_tertiaryAccentColor"/></div>
<div id="mx_theme_accentColor"></div><div id="mx_theme_secondaryAccentColor"></div><div id="mx_theme_tertiaryAccentColor"></div>
</body>
</html>

4
src/vector/index.js
View file

@ -62,6 +62,10 @@ import CallHandler from 'matrix-react-sdk/lib/CallHandler';
import {getVectorConfig} from './getconfig';
// Disable warnings for now: we use deprecated bluebird functions
// and need to migrate, but they spam the console with warnings.
Promise.config({warnings: false});
let lastLocationHashSet = null;
function initRageshake() {