From f5630b97910ccd8591aae97e587438772a33d5f4 Mon Sep 17 00:00:00 2001 From: riking Date: Tue, 21 Apr 2015 21:10:07 -0700 Subject: [PATCH] Fix JSHint errors --- .../discourse/controllers/notification.js.es6 | 2 -- .../discourse/lib/desktop-notifications.js.es6 | 10 +++++++--- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/app/assets/javascripts/discourse/controllers/notification.js.es6 b/app/assets/javascripts/discourse/controllers/notification.js.es6 index cb9ccdc947c..c0245002bc4 100644 --- a/app/assets/javascripts/discourse/controllers/notification.js.es6 +++ b/app/assets/javascripts/discourse/controllers/notification.js.es6 @@ -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() { diff --git a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 index 35a522637db..5d1a546f8a4 100644 --- a/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 +++ b/app/assets/javascripts/discourse/lib/desktop-notifications.js.es6 @@ -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); } - document.addEventListener("scroll", resetIdle); + if (document) { + document.addEventListener("scroll", resetIdle); + } window.addEventListener("mouseover", resetIdle); Discourse.PageTracker.on("change", resetIdle); }