Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Persist pinned message open-ness between room switches
Browse files Browse the repository at this point in the history
Addresses part of element-hq/element-web#5405

Signed-off-by: Travis Ralston <travpc@gmail.com>
  • Loading branch information
turt2live committed May 27, 2018
1 parent bbdc270 commit beaa276
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/components/structures/RoomView.js
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { KeyCode, isOnlyCtrlOrCmdKeyEvent } from '../../Keyboard';

import RoomViewStore from '../../stores/RoomViewStore';
import RoomScrollStateStore from '../../stores/RoomScrollStateStore';
import SettingsStore from "../../settings/SettingsStore";
import SettingsStore, {SettingLevel} from "../../settings/SettingsStore";

const DEBUG = false;
let debuglog = function() {};
Expand Down Expand Up @@ -115,6 +115,7 @@ module.exports = React.createClass({
showApps: false,
isAlone: false,
isPeeking: false,
showingPinned: false,

// error object, as from the matrix client/server API
// If we failed to load information about the room,
Expand Down Expand Up @@ -182,6 +183,7 @@ module.exports = React.createClass({
isInitialEventHighlighted: RoomViewStore.isInitialEventHighlighted(),
forwardingEvent: RoomViewStore.getForwardingEvent(),
shouldPeek: RoomViewStore.shouldPeek(),
showingPinned: SettingsStore.getValue("PinnedEvents.isOpen", RoomViewStore.getRoomId()),
};

// Temporary logging to diagnose https://github.com/vector-im/riot-web/issues/4307
Expand Down Expand Up @@ -1135,7 +1137,10 @@ module.exports = React.createClass({
},

onPinnedClick: function() {
this.setState({showingPinned: !this.state.showingPinned, searching: false});
const nowShowingPinned = !this.state.showingPinned;
const roomId = this.state.room.roomId;
this.setState({showingPinned: nowShowingPinned, searching: false});
SettingsStore.setValue("PinnedEvents.isOpen", roomId, SettingLevel.ROOM_DEVICE, nowShowingPinned);
},

onSettingsClick: function() {
Expand Down
5 changes: 5 additions & 0 deletions src/settings/Settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ const LEVELS_ACCOUNT_SETTINGS = ['device', 'account', 'config'];
const LEVELS_FEATURE = ['device', 'config'];
const LEVELS_DEVICE_ONLY_SETTINGS = ['device'];
const LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG = ['device', 'config'];
const LEVELS_DEVICE_ROOM_SETTINGS = ['room-device', 'device'];

export const SETTINGS = {
// EXAMPLE SETTING:
Expand Down Expand Up @@ -274,4 +275,8 @@ export const SETTINGS = {
displayName: _td('Enable widget screenshots on supported widgets'),
default: false,
},
"PinnedEvents.isOpen": {
supportedLevels: LEVELS_DEVICE_ROOM_SETTINGS,
default: false,
},
};

0 comments on commit beaa276

Please sign in to comment.