summaryrefslogtreecommitdiffstats
path: root/webapp/utils/text_formatting.jsx
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-06-27 08:16:01 -0400
committerChristopher Speller <crspeller@gmail.com>2016-06-27 08:16:01 -0400
commit459eee85a9ef4ee484565c089a8fc4e151fccc8a (patch)
tree40b151a9a03d78c0efc25ed7f31b651481daa485 /webapp/utils/text_formatting.jsx
parent5be6661f12171b6e09bccfc32c1b46ef042f46ac (diff)
downloadchat-459eee85a9ef4ee484565c089a8fc4e151fccc8a.tar.gz
chat-459eee85a9ef4ee484565c089a8fc4e151fccc8a.tar.bz2
chat-459eee85a9ef4ee484565c089a8fc4e151fccc8a.zip
PLT-3269 Moved formatting toggle behind EnableDeveloper setting (#3402)
* Force formatting to be enabled if testing is disabled * Moved formatting toggle behind EnableDeveloper setting
Diffstat (limited to 'webapp/utils/text_formatting.jsx')
-rw-r--r--webapp/utils/text_formatting.jsx2
1 files changed, 1 insertions, 1 deletions
diff --git a/webapp/utils/text_formatting.jsx b/webapp/utils/text_formatting.jsx
index 7f4328dc9..91be443fc 100644
--- a/webapp/utils/text_formatting.jsx
+++ b/webapp/utils/text_formatting.jsx
@@ -27,7 +27,7 @@ export function formatText(text, options = {}) {
let output = text;
// would probably make more sense if it was on the calling components, but this option is intended primarily for debugging
- if (PreferenceStore.get(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'formatting', 'true') === 'false') {
+ if (window.mm_config.EnableDeveloper === 'true' && PreferenceStore.get(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, 'formatting', 'true') === 'false') {
return output;
}