Revert "Fix error with local.storage"

This reverts commit dd1a8dd.

Author: Stigmatoz

manifest.json

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

options.html

@@ -63,7 +63,7 @@
             </div>
          </div>
          <div id='aboutBlock' hidden>
-            <div><label id='version'>v0.6.3</label></div>
+            <div><label id='version'>v0.6.0</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/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/support" target="_blank">support
                      form</a>.</label>

scripts/activity.js

@@ -54,6 +54,10 @@ class Activity {
         return hostname;
     }
 
+    loadDataFromStorage(){
+        var tabs = storage.load(STORAGE_TABS);
+    }
+
     updateFavicon(tab){
         var domain = this.extractHostname(tab.url);
         var currentTab = this.getTab(domain);

scripts/background.js

@@ -3,6 +3,7 @@
 var tabs = [];
 var currentTab;
 var activity = new Activity();
+var storage = new LocalStorage();
 
 var setting_interval_save;
 var setting_interval_inactivity;
@@ -17,8 +18,8 @@ function updateStorage() {
 }
 
 function backgroundCheck() {
-    storageLocal.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
-    storageLocal.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
+    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) { setting_interval_inactivity = item; });
+    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) { setting_view_in_badge = item; });
     chrome.windows.getLastFocused({ populate: true }, function (currentWindow) {
         if (currentWindow.focused) {
             var activeTab = currentWindow.tabs.find(t => t.active === true);
@@ -57,14 +58,14 @@ function backgroundCheck() {
 
 function backgroundUpdateStorage() {
     if (tabs.length > 0)
-        storageLocal.saveTabs(tabs);
+        storage.saveTabs(tabs);
 }
 
 function setDefaultSettings() {
-    storageLocal.saveSettings(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
-    storageLocal.saveSettings(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
-    storageLocal.saveSettings(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
-    storageLocal.saveSettings(SETTINGS_INTERVAL_SAVE_STORAGE, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
+    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() {

scripts/storage.js

@@ -1,6 +1,6 @@
 'use strict';
 
-var storageLocal = {
+class LocalStorage {
     loadTabs(name, callback) {
         chrome.storage.sync.get(name, function (item) {
             if (item[name] !== undefined) {
@@ -9,17 +9,17 @@ var storageLocal = {
                     callback(result);
             }
         });
-    },
+    }
 
     saveTabs(value, callback) {
         chrome.storage.sync.set({ tabs: value });
         if (callback !== undefined)
             callback();
-    },
+    }
 
     saveSettings(name, value) {
         chrome.storage.sync.set({ [name]: value });
-    },
+    }
 
     getSettings(name, callback) {
         chrome.storage.sync.get(name, function (item) {
@@ -28,4 +28,4 @@ var storageLocal = {
             }
         });
     }
-}
+};

scripts/webact.js

@@ -1,5 +1,6 @@
 'use strict';
 
+var storage = new LocalStorage();
 var ui = new UI();
 var totalTime;
 var tabsFromStorage;
@@ -9,7 +10,7 @@ var today = new Date().toLocaleDateString();
 var setting_range_days;
 
 document.addEventListener('DOMContentLoaded', function () {
-    storageLocal.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
+    storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) { setting_range_days = item; });
     document.getElementById('btnToday').addEventListener('click', function () {
         currentTypeOfList = TypeListEnum.ToDay;
         ui.setUIForToday();
@@ -42,11 +43,11 @@ function firstInitPage() {
 }
 
 function getDataFromStorage() {
-    storageLocal.loadTabs(STORAGE_TABS, getTabsFromStorage);
+    storage.loadTabs(STORAGE_TABS, getTabsFromStorage);
 }
 
 function getDataFromStorageByDays() {
-    storageLocal.loadTabs(STORAGE_TABS, getTabsByDays);
+    storage.loadTabs(STORAGE_TABS, getTabsByDays);
 }
 
 function getTabsFromStorage(tabs) {