deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-06-01 05:12:24 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1832 from MaxLeiter/media

Browse source 
Rename thumbnail/image option to more general `media`
This commit is contained in:
Al McKinlay 2017-12-14 09:05:40 +00:00 committed by GitHub
parent 8b52825d51 fdd8ef3e6a
commit b9f1b9fd4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
client/js/options.js
View file

@ -44,7 +44,7 @@ userOptions = null;
module.exports = options; module.exports = options;
module.exports.shouldOpenMessagePreview = function(type) { module.exports.shouldOpenMessagePreview = function(type) {
return (options.links && type === "link") || (options.media && (type === "image" || type === "audio")); return type === "link" ? options.links : options.media;
}; };
module.exports.initialize = () => { module.exports.initialize = () => {

4
client/views/windows/settings.tpl
View file

@ -74,8 +74,8 @@
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">
<label class="opt"> <label class="opt">
<input type="checkbox" name="thumbnails"> <input type="checkbox" name="media">
Auto-expand images Auto-expand media
</label> </label>
</div> </div>
<div class="col-sm-6"> <div class="col-sm-6">