deblan-mirror/thelounge
deblan-mirror/thelounge
1
0
Fork 0
mirror of https://github.com/thelounge/thelounge.git synced 2024-05-23 00:22:14 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #540 from nickel715/patch-446

Browse source 
Implement notifications for all messages
This commit is contained in:
Jérémie Astori 2016-01-10 18:03:32 -05:00
parent fdb794065f 3fe78e8972
commit ab2dc3e806
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
client/index.html
View file

@ -258,6 +258,13 @@
<button id="play">Play sound</button> <button id="play">Play sound</button>
</div> </div>
</div> </div>
<div class="col-sm-12">
<label class="opt">
<input type="checkbox" name="notifyAllMessages">
Enable notification for all messages
</label>
</div>
<div class="col-sm-12"> <div class="col-sm-12">
<h2>About Shout</h2> <h2>About Shout</h2>
</div> </div>

7
client/js/shout.js
View file

@ -373,6 +373,7 @@ $(function() {
part: true, part: true,
thumbnails: true, thumbnails: true,
quit: true, quit: true,
notifyAllMessages: false,
}, $.cookie("settings")); }, $.cookie("settings"));
for (var i in options) { for (var i in options) {
@ -398,6 +399,7 @@ $(function() {
"nick", "nick",
"part", "part",
"quit", "quit",
"notifyAllMessages",
].indexOf(name) !== -1) { ].indexOf(name) !== -1) {
chat.toggleClass("hide-" + name, !self.prop("checked")); chat.toggleClass("hide-" + name, !self.prop("checked"));
} }
@ -599,9 +601,10 @@ $(function() {
var isQuery = button.hasClass("query"); var isQuery = button.hasClass("query");
var type = msg.type; var type = msg.type;
var highlight = type.contains("highlight"); var highlight = type.contains("highlight");
if (highlight || isQuery) { var message = type.contains("message");
var settings = $.cookie("settings") || {};
if (highlight || isQuery || (settings.notifyAllMessages && message)) {
if (!document.hasFocus() || !$(target).hasClass("active")) { if (!document.hasFocus() || !$(target).hasClass("active")) {
var settings = $.cookie("settings") || {};
if (settings.notification) { if (settings.notification) {
pop.play(); pop.play();
} }