fix(timer): Automatic start/stop on browser open/close

Closes #1375
toggl · Apr 10, 2019 · 4d3151c · 4d3151c
1 parent 323ff23
commit 4d3151c
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/src/scripts/background.js b/src/scripts/background.js
@@ -137,13 +137,8 @@ window.TogglButton = {
                 });
               }
               if (resp.data.time_entries) {
-                resp.data.time_entries.some(function (timeEntry) {
-                  if (timeEntry.duration < 0) {
-                    entry = timeEntry;
-                    return true;
-                  }
-                  return false;
-                });
+                const { time_entries: timeEntries } = resp.data;
+                entry = timeEntries.find(te => te.duration < 0) || null;
               }
 
               if (TogglButton.hasWorkspaceBeenRevoked(resp.data.workspaces)) {
@@ -580,6 +575,11 @@ window.TogglButton = {
     });
   },
 
+  latestEntry: function () {
+    const timeEntries = TogglButton.$user.time_entries || [ null ];
+    return timeEntries[timeEntries.length - 1];
+  },
+
   checkPomodoroAlarm: async function (entry) {
     const duration = new Date() - new Date(entry.start);
     const pomodoroInterval = await db.get('pomodoroInterval');
@@ -2042,10 +2042,8 @@ window.TogglButton = {
       startAutomatically &&
       !!TogglButton.$user
     ) {
-      const lastEntryString = await db.get('latestStoppedEntry');
-      if (lastEntryString) {
-        const lastEntry = JSON.parse(lastEntryString);
-        TogglButton.$latestStoppedEntry = lastEntry;
+      TogglButton.$latestStoppedEntry = TogglButton.latestEntry();
+      if (TogglButton.$latestStoppedEntry) {
         TogglButton.createTimeEntry(TogglButton.$latestStoppedEntry, null);
         TogglButton.hideNotification('remind-to-track-time');
       }