diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-12-16 09:10:24 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-12-16 09:10:24 -0500 |
| commit | 34e0ac00e81f5e8912e341e4fece3b38dbb6cf76 (patch) | |
| tree | 1e67c2ce24f447e26d4abc63df28a3828c919e60 /web/react/utils | |
| parent | 3e418a100a3a491ebff7ba72ac003dd06752a30a (diff) | |
| parent | 23af326af20cffef59ac8859e7def38f744a452b (diff) | |
| download | chat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.tar.gz chat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.tar.bz2 chat-34e0ac00e81f5e8912e341e4fece3b38dbb6cf76.zip | |
Merge pull request #1733 from hmhealey/plt1437
PLT-1437 PreferenceStore api changes and fixing CreatePost warning
Diffstat (limited to 'web/react/utils')
| -rw-r--r-- | web/react/utils/utils.jsx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/web/react/utils/utils.jsx b/web/react/utils/utils.jsx index a98d22eaf..2ade00d29 100644 --- a/web/react/utils/utils.jsx +++ b/web/react/utils/utils.jsx @@ -196,8 +196,8 @@ export function displayTime(ticks) { minutes = '0' + minutes; } - const useMilitaryTime = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time', {value: 'false'}).value; - if (useMilitaryTime === 'false') { + const useMilitaryTime = PreferenceStore.getBool(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'use_military_time'); + if (!useMilitaryTime) { ampm = ' AM'; if (hours >= 12) { ampm = ' PM'; @@ -1001,7 +1001,7 @@ export function getDisplayName(user) { export function displayUsername(userId) { const user = UserStore.getProfile(userId); - const nameFormat = PreferenceStore.getPreference(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', {value: 'false'}).value; + const nameFormat = PreferenceStore.get(Constants.Preferences.CATEGORY_DISPLAY_SETTINGS, 'name_format', 'false'); let username = ''; if (user) { @@ -1253,7 +1253,7 @@ export function getPostTerm(post) { } export function isFeatureEnabled(feature) { - return PreferenceStore.getPreference(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label, {value: 'false'}).value === 'true'; + return PreferenceStore.getBool(Constants.Preferences.CATEGORY_ADVANCED_SETTINGS, Constants.FeatureTogglePrefix + feature.label); } export function isSystemMessage(post) { |