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

Author: Stigmatoz

manifest.json

@@ -3,8 +3,7 @@
 
         "name": "Web Activity Time Tracker",
         "short_name": "Web Activity",
-        "version": "0.7.0",
-
+        "version": "0.7.1",
         "minimum_chrome_version": "26",
 
         "description": "Track your activity in the browser.",

options.html

@@ -56,20 +56,25 @@
                      <option value="month3">3 month</option>
                   </select>
                </div>
+               <div class="margin-top-10">
+                  <label>Data in memory use </label><label id='memoryUse'>test</label>
+               </div>
                <div class="margin-top-10"><input type="button" value="Clear all data" id='clearAllData'></div>
                <div class="notify" id='notify' hidden>
                   Data succeed deleted
                </div>
             </div>
          </div>
          <div id='aboutBlock' hidden>
-            <div><label id='version'>v0.7.0</label></div>
+            <div><label id='version'>v0.7.1</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
+               <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/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/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/settings.js

@@ -31,28 +31,28 @@ document.addEventListener('DOMContentLoaded', function () {
 
 loadSettings();
 
-function loadSettings(){
-    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item){
+function loadSettings() {
+    storage.getSettings(SETTINGS_INTERVAL_INACTIVITY, function (item) {
         document.getElementById('intervalInactivity').value = item;
     });
-    storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item){
+    storage.getSettings(SETTINGS_INTERVAL_RANGE, function (item) {
         document.getElementById('rangeToDays').value = item;
     });
-    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item){
+    storage.getSettings(SETTINGS_VIEW_TIME_IN_BADGE, function (item) {
         document.getElementById('viewTimeInBadge').setAttribute('checked', item);
     });
-    // storage.getSettings(SETTINGS_INTERVAL_SAVE_STORAGE, function (item){
-    //     document.getElementById('intervalInactivity').value = item;
-    // });
+    storage.getMemoryUse(STORAGE_TABS, function (integer) {
+        document.getElementById('memoryUse').innerHTML = (integer/1024).toFixed(2) + 'Kb';
+    })
 }
 
-function clearAllData(){
+function clearAllData() {
     var tabs = [];
     chrome.extension.getBackgroundPage().tabs = tabs;
     storage.saveTabs(tabs, viewNotify);
 }
 
-function viewNotify(){
+function viewNotify() {
     document.getElementById('notify').hidden = false;
-    setTimeout(function(){ document.getElementById('notify').hidden = true; }, 3000);
+    setTimeout(function () { document.getElementById('notify').hidden = true; }, 3000);
 }

scripts/storage.js

@@ -28,4 +28,8 @@ class LocalStorage {
             }
         });
     }
+
+    getMemoryUse(name, callback){
+        chrome.storage.local.getBytesInUse(name, callback);
+    }
 };