Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix jshint 2

This commit is contained in:
riking 2015-04-21 21:23:05 -07:00
parent f5630b9791
commit a616d9ed1c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/assets/javascripts/discourse/initializers/subscribe-user-notifications.js.es6
View File

@ -1,5 +1,5 @@
// Subscribes to user events on the message bus // Subscribes to user events on the message bus
import { init as initDesktopNotifications, onNotification } from 'discourse/lib/desktop-notifications' import { init as initDesktopNotifications, onNotification } from 'discourse/lib/desktop-notifications';
export default { export default {
name: 'subscribe-user-notifications', name: 'subscribe-user-notifications',
@ -16,7 +16,7 @@ export default {
if (bus.baseUrl !== '/') { if (bus.baseUrl !== '/') {
// zepto compatible, 1 param only // zepto compatible, 1 param only
bus.ajax = function(opts){ bus.ajax = function(opts) {
opts.headers = opts.headers || {}; opts.headers = opts.headers || {};
opts.headers['X-Shared-Session-Key'] = $('meta[name=shared_session_key]').attr('content'); opts.headers['X-Shared-Session-Key'] = $('meta[name=shared_session_key]').attr('content');
return $.ajax(opts); return $.ajax(opts);
@ -50,8 +50,8 @@ export default {
} }
}, user.notification_channel_position); }, user.notification_channel_position);
bus.subscribe("/categories", function(data){ bus.subscribe("/categories", function(data) {
_.each(data.categories,function(c){ _.each(data.categories,function(c) {
site.updateCategory(c); site.updateCategory(c);
}); });
}); });

4
app/assets/javascripts/discourse/lib/desktop-notifications.js.es6
View File

@ -31,9 +31,9 @@ function init(container) {
Em.Logger.error(e); Em.Logger.error(e);
} }
} }
}).catch(function(e) { }).catch(function() {
liveEnabled = false; liveEnabled = false;
Em.Logger.info('Discourse desktop notifications are disabled - permission denied.'); //Em.Logger.debug('Discourse desktop notifications are disabled - permission denied.');
}); });
} }