Merge branch 'dev' of https://bitbucket.org/Stigmat/chrome_extension into release

Author: Stigmatoz

manifest.json

@@ -3,7 +3,7 @@
 
         "name": "Web Activity Time Tracker",
         "short_name": "Web Activity",
-        "version": "0.6.0",
+        "version": "0.6.4",
 
         "minimum_chrome_version": "26",
 

options.html

@@ -63,13 +63,13 @@
             </div>
          </div>
          <div id='aboutBlock' hidden>
-            <div><label id='version'>v0.6.0</label></div>
+            <div><label id='version'>v0.6.4</label></div>
             <div class="margin-top-20">
-               <label>If experiencing problems, having questions or suggestions, please fill out <a href="https://chrome.google.com/webstore/detail/webtime-tracker/fohgfakiidklhicnjedbohplegpnmbch/support" target="_blank">support
+               <label>If experiencing problems, having questions or suggestions, please fill out <a href="https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/support" target="_blank">support
                      form</a>.</label>
             </div>
             <div class="margin-top-20">
-               <label>Do you enjoy using Web Activity Time Tracker? <a href="https://chrome.google.com/webstore/detail/webtime-tracker/fohgfakiidklhicnjedbohplegpnmbch/reviews" target="_blank">Let me know!</a></label>
+               <label>Do you enjoy using Web Activity Time Tracker? <a href="https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/reviews" target="_blank">Let me know!</a></label>
             </div>
          </div>
       </div>

scripts/background.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var tabs = [];
+var tabs;
 var currentTab;
 var activity = new Activity();
 var storage = new LocalStorage();
@@ -57,7 +57,7 @@ function backgroundCheck() {
 }
 
 function backgroundUpdateStorage() {
-    if (tabs.length > 0)
+    if (tabs != undefined && tabs.length > 0)
         storage.saveTabs(tabs);
 }
 
@@ -81,12 +81,23 @@ function addListener() {
         });
     });
     chrome.runtime.onInstalled.addListener(function (details) {
-        //if (details.reason == "install") {
-        setDefaultSettings();
-        //}
+        if (details.reason == "install") {
+            setDefaultSettings();
+        }
+    });
+}
+
+function loadTabs() {
+    storage.loadTabs(STORAGE_TABS, function (items) 
+    { 
+        tabs = [];
+        for (var i=0; i<items.length; i++){
+            tabs.push(new Tab(items[i].url, items[i].favicon, items[i].days, items[i].summaryTime));
+        }
     });
 }
 
+loadTabs();
 addListener();
 updateSummaryTime();
 updateStorage();

scripts/tab.js

@@ -1,11 +1,17 @@
 'use strict';
 
 class Tab {
-    constructor(url, favicon) {
+    constructor(url, favicon, days, summary) {
         this.url = url;
         this.favicon = favicon;
-        this.summaryTime = 0;
-        this.days = [];
+        if (summary !== undefined)
+            this.summaryTime = summary;
+        else
+            this.summaryTime = 0;
+        if (days !== undefined)
+            this.days = days;
+        else
+            this.days = [];
     }
 
     incSummaryTime() {
@@ -21,7 +27,7 @@ class Tab {
         }
     }
 
-    addNewDay(today){
+    addNewDay(today) {
         this.days.push(
             {
                 'date': today,