From 84d74344e703dae678cdadaab627885796f32e8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Paczyn=CC=81ski?= <kuba.paczynski@gmail.com>
Date: Tue, 3 Oct 2017 10:46:27 +0200
Subject: [PATCH] Naming adjustments, moved hb init to component

---
 assets/js/components/WakaTime.jsx |  2 ++
 assets/js/core/WakaTimeCore.js    | 15 +++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/assets/js/components/WakaTime.jsx b/assets/js/components/WakaTime.jsx
index bea26f9..b505e46 100644
--- a/assets/js/components/WakaTime.jsx
+++ b/assets/js/components/WakaTime.jsx
@@ -67,6 +67,8 @@ var Wakatime = React.createClass({
                         totalTimeLoggedToday: grand_total.text
                     });
                 });
+
+                wakatime.recordHeartbeat();
             }
             else {
                 changeExtensionState('notSignedIn');
diff --git a/assets/js/core/WakaTimeCore.js b/assets/js/core/WakaTimeCore.js
index 7b12203..03fc1b8 100644
--- a/assets/js/core/WakaTimeCore.js
+++ b/assets/js/core/WakaTimeCore.js
@@ -9,6 +9,7 @@ var config = require('./../config');
 var getDomainFromUrl = require('./../helpers/getDomainFromUrl');
 var changeExtensionState = require('../helpers/changeExtensionState');
 var in_array = require('./../helpers/in_array');
+var contains = require('./../helpers/contains');
 
 class WakaTimeCore {
 
@@ -61,7 +62,6 @@ class WakaTimeCore {
             dataType: 'json',
             success: (data) => {
                 deferredObject.resolve(data.data);
-                this.recordHeartbeat();
             },
             error: (xhr, status, err) => {
                 console.error(config.currentUserApiUrl, status, err.toString());
@@ -92,7 +92,7 @@ class WakaTimeCore {
                         chrome.tabs.query({active: true}, (tabs) => {
 
                             var currentActiveTab = tabs[0];
-                            var debug = false, entity;
+                            var debug = false;
 
                             // If the current active tab has devtools open
                             if (in_array(currentActiveTab.id, this.tabsWithDevtoolsOpen)) {
@@ -100,8 +100,7 @@ class WakaTimeCore {
                             }
 
                             if (items.loggingStyle == 'blacklist') {
-                                entity = this.checkURL(currentActiveTab.url, items.blacklist);
-                                if (! entity.url) {
+                                if (! contains(currentActiveTab.url, items.blacklist)) {
                                     this.sendHeartbeat({
                                         url: currentActiveTab.url,
                                         project: false
@@ -114,9 +113,9 @@ class WakaTimeCore {
                             }
 
                             if (items.loggingStyle == 'whitelist') {
-                                entity = this.checkURL(currentActiveTab.url, items.whitelist);
-                                if (entity.url) {
-                                    this.sendHeartbeat(entity, debug);
+                                var heartbeat = this.getHeartbeat(currentActiveTab.url, items.whitelist);
+                                if (heartbeat.url) {
+                                    this.sendHeartbeat(heartbeat, debug);
                                 }
                                 else {
                                     changeExtensionState('whitelisted');
@@ -143,7 +142,7 @@ class WakaTimeCore {
      * @param list
      * @returns {object}
      */
-    checkURL(url, list) {
+    getHeartbeat(url, list) {
         var lines = list.split('\n');
 
         for (var i = 0; i < lines.length; i ++) {