imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ignore the default value when calculating if notifications are enabled

Browse source 
This is to make the "Enable desktop notifications" checkbox accurately reflect the user's preference. The device-level setting is still respected. 

Signed-off-by: Travis Ralston <travpc@gmail.com>
This commit is contained in:
Travis Ralston 2017-12-25 13:29:30 -07:00
parent 6f674f21f6
commit 2815c576c1
3 changed files with 11 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/settings/SettingsStore.js
View file

@ -222,9 +222,9 @@ export default class SettingsStore {
if (explicit) {
const handler = handlers[level];
if (!handler) return SettingsStore._tryControllerOverride(settingName, level, roomId, null);
if (!handler) return SettingsStore._tryControllerOverride(settingName, level, roomId, null, null);
const value = handler.getValue(settingName, roomId);
return SettingsStore._tryControllerOverride(settingName, level, roomId, value);
return SettingsStore._tryControllerOverride(settingName, level, roomId, value, level);
}
for (let i = minIndex; i < levelOrder.length; i++) {
@ -234,17 +234,17 @@ export default class SettingsStore {
const value = handler.getValue(settingName, roomId);
if (value === null || value === undefined) continue;
return SettingsStore._tryControllerOverride(settingName, level, roomId, value);
return SettingsStore._tryControllerOverride(settingName, level, roomId, value, levelOrder[i]);
}
return SettingsStore._tryControllerOverride(settingName, level, roomId, null);
return SettingsStore._tryControllerOverride(settingName, level, roomId, null, null);
}
static _tryControllerOverride(settingName, level, roomId, calculatedValue) {
static _tryControllerOverride(settingName, level, roomId, calculatedValue, calculatedAtLevel) {
const controller = SETTINGS[settingName].controller;
if (!controller) return calculatedValue;
const actualValue = controller.getValueOverride(level, roomId, calculatedValue);
const actualValue = controller.getValueOverride(level, roomId, calculatedValue, calculatedAtLevel);
if (actualValue !== undefined && actualValue !== null) return actualValue;
return calculatedValue;
}