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

use const when var immutable, no need for var used only once

Browse Source
This commit is contained in:
Alan Hamlett
2021-01-12 00:06:09 -08:00
parent aa655f7a63
commit 649c64cf1d
1 changed files with 265 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,7 +12,6 @@ var in_array = require('./../helpers/in_array');
var contains = require('./../helpers/contains');
class WakaTimeCore {
constructor() {
this.tabsWithDevtoolsOpen = [];
}
@@ -33,17 +32,14 @@ class WakaTimeCore {
$.ajax({
url: config.summariesApiUrl + '?start=' + today + '&end=' + today,
dataType: 'json',
success: (data) => {
success: data => {
deferredObject.resolve(data.data[0].grand_total);
},
error: (xhr, status, err) => {
console.error(config.summariesApiUrl, status, err.toString());
deferredObject.resolve(false);
}
},
});
return deferredObject.promise();
@@ -60,13 +56,13 @@ class WakaTimeCore {
$.ajax({
url: config.currentUserApiUrl,
dataType: 'json',
success: (data) => {
success: data => {
deferredObject.resolve(data.data);
},
error: (xhr, status, err) => {
console.error(config.currentUserApiUrl, status, err.toString());
deferredObject.resolve(false);
}
},
});
return deferredObject.promise();
@@ -77,19 +73,21 @@ class WakaTimeCore {
* and sends it to WakaTime for logging.
*/
recordHeartbeat() {
browser.storage.sync.get({
browser.storage.sync
.get({
loggingEnabled: config.loggingEnabled,
loggingStyle: config.loggingStyle,
blacklist: '',
whitelist: ''
}).then((items) => {
whitelist: '',
})
.then(items => {
if (items.loggingEnabled === true) {
changeExtensionState('allGood');
browser.idle.queryState(config.detectionIntervalInSeconds).then((newState) => {
browser.idle.queryState(config.detectionIntervalInSeconds).then(newState => {
if (newState === 'active') {
// Get current tab URL.
browser.tabs.query({currentWindow: true, active: true}).then((tabs) => {
browser.tabs.query({ currentWindow: true, active: true }).then(tabs => {
if (tabs.length == 0) return;
var currentActiveTab = tabs[0];
@@ -101,13 +99,15 @@ class WakaTimeCore {
}
if (items.loggingStyle == 'blacklist') {
if (! contains(currentActiveTab.url, items.blacklist)) {
this.sendHeartbeat({
if (!contains(currentActiveTab.url, items.blacklist)) {
this.sendHeartbeat(
{
url: currentActiveTab.url,
project: null,
}, debug);
}
else {
},
debug,
);
} else {
changeExtensionState('blacklisted');
console.log(currentActiveTab.url + ' is on a blacklist.');
}
@@ -117,18 +117,15 @@ class WakaTimeCore {
var heartbeat = this.getHeartbeat(currentActiveTab.url, items.whitelist);
if (heartbeat.url) {
this.sendHeartbeat(heartbeat, debug);
}
else {
} else {
changeExtensionState('whitelisted');
console.log(currentActiveTab.url + ' is not on a whitelist.');
}
}
});
}
});
}
else {
} else {
changeExtensionState('notLogging');
}
});
@@ -144,17 +141,17 @@ class WakaTimeCore {
* @returns {object}
*/
getHeartbeat(url, list) {
var lines = list.split('\n');
const projectIndicatorCharacters = '@@';
const lines = list.split('\n');
for (var i = 0; i < lines.length; i++) {
// strip (http:// or https://) and trailing (`/` or `@@`)
var line = lines[i];
var cleanLine = line.trim().replace(/(\/|@@)$/, '').replace(/^(?:https?:\/\/)?/i, '');
var emptyLine = cleanLine === '';
if (emptyLine) {
continue;
}
var projectIndicatorCharacters = '@@';
var cleanLine = lines[i]
.trim()
.replace(/(\/|@@)$/, '')
.replace(/^(?:https?:\/\/)?/i, '');
if (cleanLine === '') continue;
var projectIndicatorIndex = cleanLine.lastIndexOf(projectIndicatorCharacters);
var projectIndicatorExists = projectIndicatorIndex > -1;
var projectName = null;
@@ -162,7 +159,9 @@ class WakaTimeCore {
if (projectIndicatorExists) {
var start = projectIndicatorIndex + projectIndicatorCharacters.length;
projectName = cleanLine.substring(start);
urlFromLine = cleanLine.replace(cleanLine.substring(projectIndicatorIndex), '').replace(/\/$/, '');
urlFromLine = cleanLine
.replace(cleanLine.substring(projectIndicatorIndex), '')
.replace(/\/$/, '');
}
var schemaHttpExists = url.match(/^http:\/\//i);
var schemaHttpsExists = url.match(/^https:\/\//i);
@@ -173,12 +172,15 @@ class WakaTimeCore {
if (schemaHttpsExists) {
schema = 'https://';
}
var cleanUrl = url.trim().replace(/(\/|@@)$/, '').replace(/^(?:https?:\/\/)?/i, '');
var cleanUrl = url
.trim()
.replace(/(\/|@@)$/, '')
.replace(/^(?:https?:\/\/)?/i, '');
var startsWithUrl = cleanUrl.toLowerCase().indexOf(urlFromLine.toLowerCase()) > -1;
if (startsWithUrl) {
return {
url: schema + urlFromLine,
project: projectName
project: projectName,
};
}
}
@@ -205,11 +207,10 @@ class WakaTimeCore {
time: moment().format('X'),
project: heartbeat.project || '<<LAST_PROJECT>>',
is_debugging: debug,
plugin: 'browser-wakatime/' + config.version
plugin: 'browser-wakatime/' + config.version,
});
}
/**
* Returns a promise with logging type variable.
*
@@ -219,9 +220,11 @@ class WakaTimeCore {
_getLoggingType() {
var deferredObject = $.Deferred();
browser.storage.sync.get({
loggingType: config.loggingType
}).then(function (items) {
browser.storage.sync
.get({
loggingType: config.loggingType,
})
.then(function (items) {
deferredObject.resolve(items.loggingType);
});
@@ -238,7 +241,7 @@ class WakaTimeCore {
sendHeartbeat(heartbeat, debug) {
var payload = null;
this._getLoggingType().done((loggingType) => {
this._getLoggingType().done(loggingType => {
// Get only the domain from the entity.
// And send that in heartbeat
if (loggingType == 'domain') {
@@ -264,7 +267,6 @@ class WakaTimeCore {
* @returns {*}
*/
sendAjaxRequestToApi(payload, method = 'POST') {
var deferredObject = $.Deferred();
$.ajax({
@@ -279,21 +281,20 @@ class WakaTimeCore {
},
201: function () {
// nothing to do here
}
},
success: (response) => {
},
success: response => {
deferredObject.resolve(this);
},
error: (xhr, status, err) => {
console.error(config.heartbeatApiUrl, status, err.toString());
deferredObject.resolve(this);
}
},
});
return deferredObject.promise();
}
}
export default WakaTimeCore;