From 649910139aef5850ec2c6136f633c90827355481 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 17 Dec 2018 12:27:42 +0100 Subject: [PATCH 1/2] disable setting theme completely --- src/components/structures/MatrixChat.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 4d7c71e3ef..3f73bf9dd8 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -1079,6 +1079,10 @@ export default React.createClass({ * @param {string} theme new theme */ _onSetTheme: function(theme) { + // disable changing the theme for now + // as other themes are not compatible with dharma + return; + if (!theme) { theme = SettingsStore.getValue("theme"); } From 510cec1ebfaadefa25e11399de78474a3e50efa0 Mon Sep 17 00:00:00 2001 From: Bruno Windels Date: Mon, 17 Dec 2018 12:49:38 +0100 Subject: [PATCH 2/2] disabling setting theme without breaking the build --- src/components/structures/MatrixChat.js | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/src/components/structures/MatrixChat.js b/src/components/structures/MatrixChat.js index 3f73bf9dd8..0a062afc43 100644 --- a/src/components/structures/MatrixChat.js +++ b/src/components/structures/MatrixChat.js @@ -673,9 +673,11 @@ export default React.createClass({ }); break; } - case 'set_theme': - this._onSetTheme(payload.value); - break; + // case 'set_theme': + // disable changing the theme for now + // as other themes are not compatible with dharma + // this._onSetTheme(payload.value); + // break; case 'on_logging_in': // We are now logging in, so set the state to reflect that // NB. This does not touch 'ready' since if our dispatches @@ -1079,10 +1081,6 @@ export default React.createClass({ * @param {string} theme new theme */ _onSetTheme: function(theme) { - // disable changing the theme for now - // as other themes are not compatible with dharma - return; - if (!theme) { theme = SettingsStore.getValue("theme"); }