Matrix-Mirrors/schildi-web
1
0
Fork 0
mirror of https://github.com/SchildiChat/element-web.git synced 2024-10-01 01:26:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

use new theme-aware tinter api

Browse Source
This commit is contained in:
Matthew Hodgson 2017-11-08 06:55:30 -08:00
parent d4128af224
commit 2fa1f16284
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vector/index.js
View File

@ -78,6 +78,7 @@ import {parseQs, parseQsFromFragment} from './url_utils';
import Platform from './platform';
import MatrixClientPeg from 'matrix-react-sdk/lib/MatrixClientPeg';
import Tinter from 'matrix-react-sdk/lib/Tinter';
var lastLocationHashSet = null;
@ -288,19 +289,25 @@ async function loadApp() {
// as quickly as we possibly can, set a default theme...
const styleElements = Object.create(null);
let a;
const theme = configJson.default_theme || 'light';
for (let i = 0; (a = document.getElementsByTagName("link")[i]); i++) {
const href = a.getAttribute("href");
// shouldn't we be using the 'title' tag rather than the href?
const match = href.match(/^bundles\/.*\/theme-(.*)\.css$/);
if (match) {
if (match[1] === (configJson.default_theme || 'light')) {
if (match[1] === theme) {
// remove the disabled flag off the stylesheet
a.removeAttribute("disabled");
}
}
}
// XXX: do we also need to call MatrixChat.setTheme here to do any random fixups (e.g. svg tint)
// in case the Tinter.tint() in MatrixChat fires before the
// CSS has actually loaded (which in practice happens)
a.onload = () => {
Tinter.setTheme(theme);
Tinter.tint();
};
}
}
}
if (window.localStorage && window.localStorage.getItem('mx_accepts_unsupported_browser')) {
console.log('User has previously accepted risks in using an unsupported browser');