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

Iterate things

Browse source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2020-02-19 14:52:00 +00:00
parent d70a9bd001
commit a6edc34e97
5 changed files with 35 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/settings/Settings.js
View file

@ -26,7 +26,6 @@ import CustomStatusController from "./controllers/CustomStatusController";
import ThemeController from './controllers/ThemeController';
import ReloadOnChangeController from "./controllers/ReloadOnChangeController";
import {RIGHT_PANEL_PHASES} from "../stores/RightPanelStorePhases";
import RoomListOrderingController from "./controllers/RoomListOrderingController";
// These are just a bunch of helper arrays to avoid copy/pasting a bunch of times
const LEVELS_ROOM_SETTINGS = ['device', 'room-device', 'room-account', 'account', 'config'];
@ -434,11 +433,10 @@ export const SETTINGS = {
deny: [],
},
},
"RoomList.orderingAlgorithm": {
"RoomList.orderByRecents": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,
displayName: _td("Order rooms by message activity instead of by name"),
default: "recent", // controller maps boolean onto algorithm for future flexibility to >2 algorithms
controller: new RoomListOrderingController(),
default: true,
},
"RoomList.orderByImportance": {
supportedLevels: LEVELS_ACCOUNT_SETTINGS,

6
src/settings/SettingsStore.js
View file

@ -420,13 +420,9 @@ export default class SettingsStore {
throw new Error("User cannot set " + settingName + " at " + level + " in " + roomId);
}
const controller = setting.controller;
if (controller) {
value = controller.augmentValue(level, roomId, value);
}
await handler.setValue(settingName, roomId, value);
const controller = setting.controller;
if (controller) {
controller.onChange(level, roomId, value);
}

35
src/settings/controllers/RoomListOrderingController.js
View file

@ -1,35 +0,0 @@
/*
Copyright 2020 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import SettingController from "./SettingController";
export default class RoomListOrderingController extends SettingController {
augmentValue(level, roomId, newValue): * {
// currently we expose algorithm as a boolean but store it as a string for future flexibility
// where we may want >2 algorithms available for the user to choose between.
return newValue ? "recent" : "alphabetic";
}
getValueOverride(level: string, roomId: String, calculatedValue: *, calculatedAtLevel: string): * {
switch (calculatedValue) {
case "alphabetic":
return false;
case "recent":
default:
return true;
}
}
}