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

Fix JSHint errors

This commit is contained in:
riking 2015-04-21 21:10:07 -07:00
parent fdf86143b3
commit f5630b9791
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/notification.js.es6
View File

@ -1,8 +1,6 @@
import ObjectController from 'discourse/controllers/object';
import { notificationUrl } from 'discourse/lib/desktop-notifications';
var INVITED_TYPE= 8;
export default ObjectController.extend({
scope: function() {

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

@ -9,6 +9,7 @@ const focusTrackerKey = "focus-tracker";
const seenDataKey = "seen-notifications";
const recentUpdateThreshold = 1000 * 60 * 2; // 2 minutes
const idleThresholdTime = 1000 * 10; // 10 seconds
const INVITED_TYPE = 8;
function init(container) {
liveEnabled = false;
@ -27,7 +28,7 @@ function init(container) {
try {
init2(container);
} catch (e) {
console.error(e);
Em.Logger.error(e);
}
}
}).catch(function(e) {
@ -71,6 +72,7 @@ function init2(container) {
primaryTab = false;
}
});
window.addEventListener("focus", function() {
if (!primaryTab) {
primaryTab = true;
@ -78,14 +80,16 @@ function init2(container) {
}
});
if (document.hidden) {
if (document && (typeof document.hidden !== "undefined") && document["hidden"]) {
primaryTab = false;
} else {
primaryTab = true;
localStorage.setItem(focusTrackerKey, mbClientId);
}
if (document) {
document.addEventListener("scroll", resetIdle);
}
window.addEventListener("mouseover", resetIdle);
Discourse.PageTracker.on("change", resetIdle);
}