kurbezz/browser-wakatime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Naming adjustments, moved hb init to component

Browse Source
This commit is contained in:
Kuba Paczyński
2017-10-03 10:46:27 +02:00
parent 821cb3ea63
commit 84d74344e7
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/components/WakaTime.jsx
View File

@@ -67,6 +67,8 @@ var Wakatime = React.createClass({
totalTimeLoggedToday: grand_total.text totalTimeLoggedToday: grand_total.text
}); });
}); });
wakatime.recordHeartbeat();
} }
else { else {
changeExtensionState('notSignedIn'); changeExtensionState('notSignedIn');

15
assets/js/core/WakaTimeCore.js
View File

@@ -9,6 +9,7 @@ var config = require('./../config');
var getDomainFromUrl = require('./../helpers/getDomainFromUrl'); var getDomainFromUrl = require('./../helpers/getDomainFromUrl');
var changeExtensionState = require('../helpers/changeExtensionState'); var changeExtensionState = require('../helpers/changeExtensionState');
var in_array = require('./../helpers/in_array'); var in_array = require('./../helpers/in_array');
var contains = require('./../helpers/contains');
class WakaTimeCore { class WakaTimeCore {
@@ -61,7 +62,6 @@ class WakaTimeCore {
dataType: 'json', dataType: 'json',
success: (data) => { success: (data) => {
deferredObject.resolve(data.data); deferredObject.resolve(data.data);
this.recordHeartbeat();
}, },
error: (xhr, status, err) => { error: (xhr, status, err) => {
console.error(config.currentUserApiUrl, status, err.toString()); console.error(config.currentUserApiUrl, status, err.toString());
@@ -92,7 +92,7 @@ class WakaTimeCore {
chrome.tabs.query({active: true}, (tabs) => { chrome.tabs.query({active: true}, (tabs) => {
var currentActiveTab = tabs[0]; var currentActiveTab = tabs[0];
var debug = false, entity; var debug = false;
// If the current active tab has devtools open // If the current active tab has devtools open
if (in_array(currentActiveTab.id, this.tabsWithDevtoolsOpen)) { if (in_array(currentActiveTab.id, this.tabsWithDevtoolsOpen)) {
@@ -100,8 +100,7 @@ class WakaTimeCore {
} }
if (items.loggingStyle == 'blacklist') { if (items.loggingStyle == 'blacklist') {
entity = this.checkURL(currentActiveTab.url, items.blacklist); if (! contains(currentActiveTab.url, items.blacklist)) {
if (! entity.url) {
this.sendHeartbeat({ this.sendHeartbeat({
url: currentActiveTab.url, url: currentActiveTab.url,
project: false project: false
@@ -114,9 +113,9 @@ class WakaTimeCore {
} }
if (items.loggingStyle == 'whitelist') { if (items.loggingStyle == 'whitelist') {
entity = this.checkURL(currentActiveTab.url, items.whitelist); var heartbeat = this.getHeartbeat(currentActiveTab.url, items.whitelist);
if (entity.url) { if (heartbeat.url) {
this.sendHeartbeat(entity, debug); this.sendHeartbeat(heartbeat, debug);
} }
else { else {
changeExtensionState('whitelisted'); changeExtensionState('whitelisted');
@@ -143,7 +142,7 @@ class WakaTimeCore {
* @param list * @param list
* @returns {object} * @returns {object}
*/ */
checkURL(url, list) { getHeartbeat(url, list) {
var lines = list.split('\n'); var lines = list.split('\n');
for (var i = 0; i < lines.length; i ++) { for (var i = 0; i < lines.length; i ++) {