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

Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show

Browse source
This commit is contained in:
David Baker 2017-11-20 10:00:47 +00:00
commit e2f5e16fa7
7 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/components/structures/UserSettings.js
View file

@ -92,7 +92,12 @@ const ANALYTICS_SETTINGS = [
// These settings must be defined in SettingsStore
const WEBRTC_SETTINGS = [
{ id: 'webRtcForceTURN' },
{
id: 'webRtcForceTURN',
fn: (val) => {
MatrixClientPeg.get().setForceTURN(val);
},
},
];
// These settings must be defined in SettingsStore

4
src/components/views/room_settings/UrlPreviewSettings.js
View file

@ -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;
},
@ -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>);