Spring cleanup
This commit is contained in:
1 parent
83c5d701b3
commit
99e77e409a
98 files changed
+469
-489
No files matched your search
@@ -131,7 +131,7 @@ class CoreNotifier(Notification):
|
||||
|
||||
for message in messages:
|
||||
if message.get('time') > last_check:
|
||||
message['sticky'] = True # Always sticky core messages
|
||||
message['sticky'] = True # Always sticky core messages
|
||||
|
||||
message_type = 'core.message.important' if message.get('important') else 'core.message'
|
||||
fireEvent(message_type, message = message.get('message'), data = message)
|
||||
|
||||
@@ -17,14 +17,14 @@ var NotificationBase = new Class({
|
||||
App.addEvent('load', self.addTestButtons.bind(self));
|
||||
|
||||
// Notification bar
|
||||
self.notifications = []
|
||||
self.notifications = [];
|
||||
App.addEvent('load', function(){
|
||||
|
||||
App.block.notification = new Block.Menu(self, {
|
||||
'button_class': 'icon2.eye-open',
|
||||
'class': 'notification_menu',
|
||||
'onOpen': self.markAsRead.bind(self)
|
||||
})
|
||||
});
|
||||
$(App.block.notification).inject(App.getBlock('search'), 'after');
|
||||
self.badge = new Element('div.badge').inject(App.block.notification, 'top').hide();
|
||||
|
||||
@@ -40,7 +40,7 @@ var NotificationBase = new Class({
|
||||
var self = this;
|
||||
|
||||
var added = new Date();
|
||||
added.setTime(result.added*1000)
|
||||
added.setTime(result.added*1000);
|
||||
|
||||
result.el = App.getBlock('notification').addLink(
|
||||
new Element('span.'+(result.read ? 'read' : '' )).adopt(
|
||||
@@ -51,7 +51,7 @@ var NotificationBase = new Class({
|
||||
self.notifications.include(result);
|
||||
|
||||
if((result.data.important !== undefined || result.data.sticky !== undefined) && !result.read){
|
||||
var sticky = true
|
||||
var sticky = true;
|
||||
App.trigger('message', [result.message, sticky, result])
|
||||
}
|
||||
else if(!result.read){
|
||||
@@ -62,7 +62,7 @@ var NotificationBase = new Class({
|
||||
|
||||
setBadge: function(value){
|
||||
var self = this;
|
||||
self.badge.set('text', value)
|
||||
self.badge.set('text', value);
|
||||
self.badge[value ? 'show' : 'hide']()
|
||||
},
|
||||
|
||||
@@ -73,9 +73,9 @@ var NotificationBase = new Class({
|
||||
if(!force_ids) {
|
||||
var rn = self.notifications.filter(function(n){
|
||||
return !n.read && n.data.important === undefined
|
||||
})
|
||||
});
|
||||
|
||||
var ids = []
|
||||
var ids = [];
|
||||
rn.each(function(n){
|
||||
ids.include(n._id)
|
||||
})
|
||||
@@ -106,7 +106,7 @@ var NotificationBase = new Class({
|
||||
'onSuccess': function(json){
|
||||
self.processData(json, true)
|
||||
}
|
||||
}).send()
|
||||
}).send();
|
||||
|
||||
setInterval(function(){
|
||||
|
||||
@@ -141,7 +141,7 @@ var NotificationBase = new Class({
|
||||
|
||||
stopPoll: function(){
|
||||
if(this.request)
|
||||
this.request.cancel()
|
||||
this.request.cancel();
|
||||
this.stopped = true;
|
||||
},
|
||||
|
||||
@@ -154,7 +154,7 @@ var NotificationBase = new Class({
|
||||
App.trigger(result._t || result.type, [result]);
|
||||
if(result.message && result.read === undefined && !init)
|
||||
self.showMessage(result.message);
|
||||
})
|
||||
});
|
||||
|
||||
if(json.result.length > 0)
|
||||
self.last_id = json.result.getLast().message_id
|
||||
@@ -180,11 +180,11 @@ var NotificationBase = new Class({
|
||||
}, 10);
|
||||
|
||||
var hide_message = function(){
|
||||
new_message.addClass('hide')
|
||||
new_message.addClass('hide');
|
||||
setTimeout(function(){
|
||||
new_message.destroy();
|
||||
}, 1000);
|
||||
}
|
||||
};
|
||||
|
||||
if(sticky)
|
||||
new_message.grab(
|
||||
@@ -206,7 +206,7 @@ var NotificationBase = new Class({
|
||||
addTestButtons: function(){
|
||||
var self = this;
|
||||
|
||||
var setting_page = App.getPage('Settings')
|
||||
var setting_page = App.getPage('Settings');
|
||||
setting_page.addEvent('create', function(){
|
||||
Object.each(setting_page.tabs.notifications.groups, self.addTestButton.bind(self))
|
||||
})
|
||||
|
||||
@@ -97,7 +97,8 @@ config = [{
|
||||
'name': 'smtp_server',
|
||||
'label': 'SMTP server',
|
||||
},
|
||||
{ 'name': 'smtp_port',
|
||||
{
|
||||
'name': 'smtp_port',
|
||||
'label': 'SMTP server port',
|
||||
'default': '25',
|
||||
'type': 'int',
|
||||
|
||||
@@ -19,6 +19,8 @@ class Growl(Notification):
|
||||
def __init__(self):
|
||||
super(Growl, self).__init__()
|
||||
|
||||
self.growl = None
|
||||
|
||||
if self.isEnabled():
|
||||
addEvent('app.load', self.register)
|
||||
|
||||
|
||||
@@ -20,6 +20,7 @@ autoload = 'NMJ'
|
||||
|
||||
class NMJ(Notification):
|
||||
|
||||
# noinspection PyMissingConstructor
|
||||
def __init__(self):
|
||||
addEvent('renamer.after', self.addToLibrary)
|
||||
addApiView(self.testNotifyName(), self.test)
|
||||
|
||||
@@ -30,7 +30,7 @@ class Pushalot(Notification):
|
||||
}
|
||||
|
||||
headers = {
|
||||
'Content-type': 'application/x-www-form-urlencoded'
|
||||
'Content-type': 'application/x-www-form-urlencoded'
|
||||
}
|
||||
|
||||
try:
|
||||
|
||||
@@ -33,10 +33,9 @@ class Pushover(Notification):
|
||||
'url_title': toUnicode('%s on IMDb' % getTitle(data)),
|
||||
})
|
||||
|
||||
http_handler.request('POST',
|
||||
"/1/messages.json",
|
||||
headers = {'Content-type': 'application/x-www-form-urlencoded'},
|
||||
body = tryUrlencode(api_data)
|
||||
http_handler.request('POST', '/1/messages.json',
|
||||
headers = {'Content-type': 'application/x-www-form-urlencoded'},
|
||||
body = tryUrlencode(api_data)
|
||||
)
|
||||
|
||||
response = http_handler.getresponse()
|
||||
|
||||
@@ -59,7 +59,7 @@ var TwitterNotification = new Class({
|
||||
).inject(fieldset.getElement('.test_button'), 'before');
|
||||
})
|
||||
|
||||
},
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
|
||||
@@ -89,7 +89,7 @@ class XBMC(Notification):
|
||||
self.use_json_notifications[host] = False
|
||||
|
||||
# send the text message
|
||||
resp = self.notifyXBMCnoJSON(host, {'title':self.default_title, 'message':message})
|
||||
resp = self.notifyXBMCnoJSON(host, {'title': self.default_title, 'message': message})
|
||||
for r in resp:
|
||||
if r.get('result') and r['result'] == 'OK':
|
||||
log.debug('Message delivered successfully!')
|
||||
|
||||
Reference in new issue
Block a user