save settings

Author: Stigmatoz

options.html

@@ -5,6 +5,7 @@
    <meta charset="utf-8">
    <title>WebActivity Time Tracker</title>
    <link href="style/settings.css" rel="stylesheet" />
+   <script src="scripts/common.js"></script>
    <script src="scripts/storage.js"></script>
    <script src="scripts/settings.js"></script>
 </head>
@@ -21,7 +22,7 @@
       <div id='block'>
          <div id="settingsBlock">
             <label>
-               <input type="checkbox" class="filled-in" id="chk-demo3" checked="checked" />
+               <input type="checkbox" class="filled-in" id="viewTimeInBadge" checked="checked" />
                <span>Display time tracker in icon</span>
             </label>
             <div class="margin-top-10">
@@ -30,8 +31,8 @@
                   <span class="tooltiptext">An activity is an action with a mouse or keyboard</span>
                </div>
                <div class="margin-top-10">
-                  <select id='timeToStopTracking' class="option">
-                     <option value="0.33">30 seconds</option>
+                  <select id='intervalInactivity' class="option">
+                     <option value="0.3">30 seconds</option>
                      <option value="0.45">45 seconds</option>
                      <option value="1">1 min</option>
                      <option value="2">2 min</option>
@@ -45,18 +46,18 @@
                <div class="margin-top-10"><label>Default range for days:</label></div>
                <div class="margin-top-10">
                   <select id='rangeToDays' class="option">
-                     <option value="2days">2 days</option>
-                     <option value="3days">3 days</option>
-                     <option value="4days">4 days</option>
-                     <option value="5days">5 days</option>
-                     <option value="6days">6 days</option>
-                     <option value="7days">7 days</option>
-                     <option value="1month">1 month</option>
-                     <option value="2month">2 month</option>
-                     <option value="3month">3 month</option>
+                     <option value="days2">2 days</option>
+                     <option value="days3">3 days</option>
+                     <option value="days4">4 days</option>
+                     <option value="days5">5 days</option>
+                     <option value="days6">6 days</option>
+                     <option value="days7">7 days</option>
+                     <option value="month1">1 month</option>
+                     <option value="month2">2 month</option>
+                     <option value="month3">3 month</option>
                   </select>
                </div>
-               <div class="margin-top-10"><input type="button" value="Clear all data"></div>
+               <div class="margin-top-10"><input type="button" value="Clear all data" id='clearAllData'></div>
             </div>
          </div>
          <div id='aboutBlock' hidden>

scripts/background.js

@@ -6,7 +6,7 @@ var activity = new Activity();
 var storage = new LocalStorage();
 
 function updateSummaryTime() {
-    setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK);
+    setInterval(backgroundCheck, SETTINGS_INTERVAL_CHECK_DEFAULT);
 }
 
 function updateStorage() {
@@ -46,18 +46,30 @@ function backgroundUpdateStorage() {
         storage.saveTabs(tabs);
 }
 
+function setDefaultSettings(){
+    storage.saveSettings(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
+    storage.saveSettings(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
+    storage.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
+    storage.saveSettings(SETTINGS_INTERVAL_SAVE_STORAGE, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
+}
+
 function addListener() {
     chrome.tabs.onActivated.addListener(function (info) {
         chrome.tabs.get(info.tabId, function (tab) {
             activity.addTab(tab);
         });
     });
 
-    chrome.webNavigation.onCompleted.addListener(function(details){
+    chrome.webNavigation.onCompleted.addListener(function (details) {
         chrome.tabs.get(details.tabId, function (tab) {
             activity.updateFavicon(tab);
         });
     });
+    chrome.runtime.onInstalled.addListener(function (details) {
+        //if (details.reason == "install") {
+            setDefaultSettings();
+        //}
+    });
 }
 
 addListener();

scripts/common.js

@@ -1,24 +1,47 @@
+var RangeForDays = {
+    days2: 'days2',
+    days3: 'days3',
+    days4: 'days4',
+    days5: 'days5',
+    days6: 'days6',
+    days7: 'days7',
+    month1: 'month1',
+    month2: 'month2',
+    month3: 'month3'
+};
+
+var InactivityInterval = {
+    second30: 0.3,
+    second45: 0.45,
+    min1: 1,
+    min2: 2,
+    min5: 5,
+    min10: 10,
+    min20: 20,
+    min30: 30,
+    min40: 40
+};
+
+var TypeListEnum = {
+    ToDay: 1,
+    All: 2,
+    ByDays: 3,
+};
+
 var STORAGE_TABS = 'tabs';
 
-var SETTINGS_INTERVAL_INACTIVITY_DEFAULT = 30;
+var SETTINGS_INTERVAL_INACTIVITY_DEFAULT = InactivityInterval.second30;
 var SETTINGS_INTERVAL_CHECK_DEFAULT = 1000;
 var SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT = 3000;
 var SETTINGS_INTERVAL_CHECK_STORAGE_DEFAULT = 3000;
-var SETTINGS_INTERVAL_RANGE_DEFAULT = 7;
+var SETTINGS_INTERVAL_RANGE_DEFAULT = RangeForDays.days7;
 var SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT = true;
 
 var SETTINGS_INTERVAL_INACTIVITY = 'inactivity_interval';
-var SETTINGS_INTERVAL_CHECK = 'interval_check';
 var SETTINGS_INTERVAL_SAVE_STORAGE = 'interval_save_in_storage';
 var SETTINGS_INTERVAL_RANGE = 'range_days';
 var SETTINGS_VIEW_TIME_IN_BADGE = 'view_time_in_badge';
 
-var TypeListEnum = {
-    ToDay: 1,
-    All: 2,
-    ByDays: 3,
-};
-
 function isEmpty(obj) {
     for (var prop in obj) {
         if (obj.hasOwnProperty(prop))

scripts/settings.js

@@ -15,10 +15,28 @@ document.addEventListener('DOMContentLoaded', function () {
         document.getElementById('settingsBlock').hidden = true;
         document.getElementById('aboutBlock').hidden = false;
     });
+    document.getElementById('clearAllData').addEventListener('click', function () {
+        clearAllData();
+    });
 });
 
 loadSettings();
 
 function loadSettings(){
-    var options = storage.getSettings();
+    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item){
+        document.getElementById('intervalInactivity').value = item[SETTINGS_INTERVAL_INACTIVITY];
+    });
+    storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item){
+        document.getElementById('rangeToDays').value = item[SETTINGS_INTERVAL_RANGE];
+    });
+    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item){
+        document.getElementById('viewTimeInBadge').setAttribute('checked', item[SETTINGS_VIEW_TIME_IN_BADGE]);
+    });
+    // storage.getSettings(SETTINGS_INTERVAL_SAVE_STORAGE, function (item){
+    //     document.getElementById('intervalInactivity').value = item;
+    // });
+}
+
+function clearAllData(){
+    storage.saveTabs(null);
 }

scripts/storage.js

@@ -16,13 +16,13 @@ class LocalStorage {
     }
 
     saveSettings(name, value) {
-        chrome.storage.local.set({ name: value });
+        chrome.storage.local.set({ [name]: value });
     }
 
     getSettings(name, callback) {
         chrome.storage.local.get(name, function(item){
             if (item !== undefined){
-                callback(item.name);
+                callback(item);
             }
         });
     }