Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
85d5d6fbba
1 changed files with 2 additions and 2 deletions
|
@ -31,7 +31,7 @@ module.exports = React.createClass({
|
||||||
saveSettings: function() {
|
saveSettings: function() {
|
||||||
const promises = [];
|
const promises = [];
|
||||||
if (this.refs.urlPreviewsRoom) promises.push(this.refs.urlPreviewsRoom.save());
|
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;
|
return promises;
|
||||||
},
|
},
|
||||||
|
|
||||||
|
@ -64,7 +64,7 @@ module.exports = React.createClass({
|
||||||
);
|
);
|
||||||
} else {
|
} else {
|
||||||
let str = _td("URL previews are enabled by default for participants in this room.");
|
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.");
|
str = _td("URL previews are disabled by default for participants in this room.");
|
||||||
}
|
}
|
||||||
previewsForRoom = (<label>{ _t(str) }</label>);
|
previewsForRoom = (<label>{ _t(str) }</label>);
|
||||||
|
|
Loading…
Reference in a new issue