Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
299a32fa98
1 changed files with 3 additions and 4 deletions
|
@ -921,7 +921,7 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
styleElements[theme].disabled = false;
|
styleElements[theme].disabled = false;
|
||||||
|
|
||||||
let switchTheme = function() {
|
const switchTheme = function() {
|
||||||
const colors = Tinter.getCurrentColors();
|
const colors = Tinter.getCurrentColors();
|
||||||
Object.values(styleElements).forEach((a) => {
|
Object.values(styleElements).forEach((a) => {
|
||||||
if (a == styleElements[theme]) return;
|
if (a == styleElements[theme]) return;
|
||||||
|
@ -933,9 +933,8 @@ module.exports = React.createClass({
|
||||||
|
|
||||||
if (styleElements[theme].complete) {
|
if (styleElements[theme].complete) {
|
||||||
switchTheme();
|
switchTheme();
|
||||||
}
|
} else {
|
||||||
else {
|
styleElements[theme].onload = () => {
|
||||||
styleElements[theme].onload = () => {
|
|
||||||
switchTheme();
|
switchTheme();
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue