OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert notification toolbar setting 

It isn't a setting.

Signed-off-by: Travis Ralston <travpc@gmail.com>
pull/21833/head
Travis Ralston 2017-11-08 17:06:36 -07:00
parent 289b0c2b6a
commit c7d8f3931f
3 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Notifier.js
View File

@ -211,15 +211,15 @@ const Notifier = {
}); });
// update the info to localStorage for persistent settings // update the info to localStorage for persistent settings
if (persistent && SettingsStore.isLevelSupported(SettingLevel.DEVICE)) { if (persistent && global.localStorage) {
return SettingsStore.setValue("notificationToolbarHidden", null, SettingLevel.DEVICE, hidden); global.localStorage.setItem("notifications_hidden", hidden);
} }
}, },
isToolbarHidden: function() { isToolbarHidden: function() {
// Check localStorage for any such meta data // Check localStorage for any such meta data
if (SettingsStore.isLevelSupported(SettingLevel.DEVICE)) { if (global.localStorage) {
return SettingsStore.getValue("notificationToolbarHidden"); return global.localStorage.getItem("notifications_hidden") === "true";
} }
return this.toolbarHidden; return this.toolbarHidden;

4
src/settings/Settings.js
View File

@ -236,8 +236,4 @@ export const SETTINGS = {
default: true, default: true,
controller: new AudioNotificationsEnabledController(), controller: new AudioNotificationsEnabledController(),
}, },
"notificationToolbarHidden": {
supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS,
default: false,
},
}; };

5
src/settings/handlers/DeviceSettingsHandler.js
View File

@ -45,8 +45,6 @@ export default class DeviceSettingsHandler extends SettingsHandler {
return localStorage.getItem("notifications_body_enabled") === "true"; return localStorage.getItem("notifications_body_enabled") === "true";
} else if (settingName === "audioNotificationsEnabled") { } else if (settingName === "audioNotificationsEnabled") {
return localStorage.getItem("audio_notifications_enabled") === "true"; return localStorage.getItem("audio_notifications_enabled") === "true";
} else if (settingName === "notificationToolbarHidden") {
return localStorage.getItem("notifications_hidden") === "true";
} }
return this._getSettings()[settingName]; return this._getSettings()[settingName];
@ -68,9 +66,6 @@ export default class DeviceSettingsHandler extends SettingsHandler {
} else if (settingName === "audioNotificationsEnabled") { } else if (settingName === "audioNotificationsEnabled") {
localStorage.setItem("audio_notifications_enabled", newValue); localStorage.setItem("audio_notifications_enabled", newValue);
return Promise.resolve(); return Promise.resolve();
} else if (settingName === "notificationToolbarHidden") {
localStorage.setItem("notifications_hidden", newValue);
return Promise.resolve();
} }
const settings = this._getSettings(); const settings = this._getSettings();