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

Fix granular URL previews #1622

Merged
merged 2 commits into from
Nov 18, 2017
Merged

Fix granular URL previews #1622

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cdf5a6f
Fix typo that prevented URL previews on a room-account level from bei…
turt2live Nov 18, 2017
d010329
Make the room-level URL preview notification explicit
turt2live Nov 18, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/components/views/room_settings/UrlPreviewSettings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = React.createClass({
saveSettings: function() {
const promises = [];
if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
if (this.refs.urlPrviewsSelf) promises.push(this.refs.urlPreviewsSelf.save());
if (this.refs.urlPreviewsSelf) promises.push(this.refs.urlPreviewsSelf.save());
return promises;
},

Expand Down Expand Up @@ -64,7 +64,7 @@ module.exports = React.createClass({
);
} else {
let str = _td("URL previews are enabled by default for participants in this room.");
if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled")) {
if (!SettingsStore.getValueAt(SettingLevel.ROOM, "urlPreviewsEnabled", roomId, /*explicit=*/true)) {
str = _td("URL previews are disabled by default for participants in this room.");
}
previewsForRoom = (<label>{ _t(str) }</label>);
Expand Down