}
},
updateTopic: function(topic, element) {
- qwebirc.ui.Colourise("[" + topic + "]", element, this.client.exec, this.parentObject.urlDispatcher.bind(this.parentObject), this);
+ qwebirc.ui.Colourise(topic, element, this.client.exec, this.parentObject.urlDispatcher.bind(this.parentObject), this);
},
close: function() {
this.closed = true;
addLine: function(type, line, colour, element) {
var hilight = qwebirc.ui.HILIGHT_NONE;
var lhilight = false;
-
+
if(type) {
hilight = qwebirc.ui.HILIGHT_ACTIVITY;
-
+
if(type.match(/(NOTICE|ACTION|MSG)$/)) {
- if(this.type == qwebirc.ui.WINDOW_QUERY || this.type == qwebirc.ui.WINDOW_MESSAGES) {
- if(type.match(/^OUR/) || type.match(/NOTICE$/)) {
- hilight = qwebirc.ui.HILIGHT_ACTIVITY;
+ var message = $defined(line) ? line["m"] : null;
+
+ /* https://dl.dropboxusercontent.com/u/180911/notify.png */
+ if(type.match(/^OUR/)) {
+ if(type.match(/NOTICE$/)) {
+ /* default */
} else {
- hilight = qwebirc.ui.HILIGHT_US;
- this.parentObject.beep();
- this.parentObject.flash();
+ hilight = qwebirc.ui.HILIGHT_SPEECH;
}
- }
- if(!type.match(/^OUR/) && this.client.hilightController.match(line["m"])) {
+ } else if(this.client.hilightController.match(message)) {
+ hilight = qwebirc.ui.HILIGHT_US;
lhilight = true;
+ } else if(type.match(/NOTICE$/)) {
+ /* default */
+ } else if(this.type == qwebirc.ui.WINDOW_QUERY || this.type == qwebirc.ui.WINDOW_MESSAGES) {
hilight = qwebirc.ui.HILIGHT_US;
- this.parentObject.beep();
- this.parentObject.flash();
- } else if(hilight != qwebirc.ui.HILIGHT_US) {
+ } else {
hilight = qwebirc.ui.HILIGHT_SPEECH;
}
+
+ if(hilight == qwebirc.ui.HILIGHT_US) {
+ var title = this.parentObject.theme.message("NOTIFY" + type + "TITLE", line, false);
+ var body = this.parentObject.theme.message("NOTIFY" + type + "BODY", line, false);
+ var selectMe = function() { this.parentObject.selectWindow(this); }.bind(this);
+
+ this.parentObject.notify(title, body, selectMe);
+ }
}
}