From cdf5a6fb8a5a23adf1853ae84085addfad2823e7 Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 17 Nov 2017 22:02:33 -0700 Subject: [PATCH 1/2] Fix typo that prevented URL previews on a room-account level from being saved Signed-off-by: Travis Ralston --- src/components/views/room_settings/UrlPreviewSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js index 6491bb0e09..821e4d0ebc 100644 --- a/src/components/views/room_settings/UrlPreviewSettings.js +++ b/src/components/views/room_settings/UrlPreviewSettings.js @@ -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; }, From d010329f4ab531f6f0d8c922abe5aef99592108e Mon Sep 17 00:00:00 2001 From: Travis Ralston Date: Fri, 17 Nov 2017 22:03:06 -0700 Subject: [PATCH 2/2] Make the room-level URL preview notification explicit Fixes https://github.com/vector-im/riot-web/issues/5638 Signed-off-by: Travis Ralston --- src/components/views/room_settings/UrlPreviewSettings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/room_settings/UrlPreviewSettings.js b/src/components/views/room_settings/UrlPreviewSettings.js index 821e4d0ebc..e4a8c9d353 100644 --- a/src/components/views/room_settings/UrlPreviewSettings.js +++ b/src/components/views/room_settings/UrlPreviewSettings.js @@ -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 = ();