Merge pull request Stigmatoz#50 from tschettler/block-deferral-option

Added block deferral option

Author: Stigmatoz

src/block.html

@@ -14,8 +14,8 @@
    <div>
       <img src="icons/time.svg" height="50">
       <p class="title">Time limit</p>
-      <div class="description">You've reached today your limit on <span id='site' class="current-site"></span></div>
-      <div class="description margin-top-10">Your current daily limit is <span id='limit' class="current-limit"></span></div>
+      <div class="description">You've reached your limit today on <span id="site" class="current-site"></span></div>
+      <div class="description margin-top-10">Your current daily limit is <span id="limit" class="current-limit"></span></div>
 
       <div class="margin-top-10"><a id="deffererBtn" class="defferer-link">Set aside for 5 minutes</a></div>
    </div>

src/options.html

@@ -30,9 +30,15 @@
         <div id='block'>
             <div id='settingsBlock'>
                 <label>
-                    <input type="checkbox" class="filled-in" id="viewTimeInBadge" checked="checked" />
+                    <input type="checkbox" class="filled-in" id="viewTimeInBadge" />
                     <span>Display time tracker in icon</span>
                 </label>
+                <div class="margin-top-10">
+                    <label>
+                        <input type="checkbox" class="filled-in" id="blockDeferral" />   
+                        <span>Allow deferring block for 5 minutes</span>
+                    </label>
+                </div>
                 <div class="margin-top-10">
                     <label>
                         <input type="checkbox" class="filled-in" id="darkMode" />   

src/scripts/background.js

@@ -13,6 +13,7 @@ var setting_restriction_list;
 var setting_interval_save;
 var setting_interval_inactivity;
 var setting_view_in_badge;
+var setting_block_deferral;
 var setting_dark_mode;
 var setting_notification_list;
 var setting_notification_message;
@@ -198,6 +199,7 @@ function setDefaultSettings() {
     storage.saveValue(SETTINGS_INTERVAL_INACTIVITY, SETTINGS_INTERVAL_INACTIVITY_DEFAULT);
     storage.saveValue(SETTINGS_INTERVAL_RANGE, SETTINGS_INTERVAL_RANGE_DEFAULT);
     storage.saveValue(SETTINGS_VIEW_TIME_IN_BADGE, SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT);
+    storage.saveValue(SETTINGS_BLOCK_DEFERRAL, SETTINGS_BLOCK_DEFERRAL_DEFAULT);
     storage.saveValue(SETTINGS_DARK_MODE, SETTINGS_DARK_MODE_DEFAULT);
     storage.saveValue(SETTINGS_INTERVAL_SAVE_STORAGE, SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT);
     storage.saveValue(STORAGE_NOTIFICATION_MESSAGE, STORAGE_NOTIFICATION_MESSAGE_DEFAULT);
@@ -259,6 +261,9 @@ function addListener() {
             if (key === SETTINGS_VIEW_TIME_IN_BADGE) {
                 storage.getValue(SETTINGS_VIEW_TIME_IN_BADGE, function(item) { setting_view_in_badge = item; });
             }
+            if (key === SETTINGS_BLOCK_DEFERRAL) {
+                storage.getValue(SETTINGS_BLOCK_DEFERRAL, function(item) { setting_block_deferral = item; });
+            }
             if (key === SETTINGS_DARK_MODE) {
                 storage.getValue(SETTINGS_DARK_MODE, function(item) { setting_dark_mode = item; });
             }
@@ -337,6 +342,7 @@ function loadNotificationMessage() {
 function loadSettings() {
     storage.getValue(SETTINGS_INTERVAL_INACTIVITY, function(item) { setting_interval_inactivity = item; });
     storage.getValue(SETTINGS_VIEW_TIME_IN_BADGE, function(item) { setting_view_in_badge = item; });
+    storage.getValue(SETTINGS_BLOCK_DEFERRAL, function(item) { setting_block_deferral = item; });
     storage.getValue(SETTINGS_DARK_MODE, function(item) { setting_dark_mode = item; });
 }
 

src/scripts/block.js

@@ -6,7 +6,7 @@ var restrictionList = [];
 
 document.addEventListener('DOMContentLoaded', function () {
     var url = new URL(document.URL);
-    blockSiteUrl = url.searchParams.get("url");
+    blockSiteUrl = url.searchParams.get('url');
     document.getElementById('site').innerText = extractHostname(blockSiteUrl);
 
     storage.getValue(STORAGE_RESTRICTION_LIST, function (items) {
@@ -19,18 +19,25 @@ document.addEventListener('DOMContentLoaded', function () {
         }
     });
 
-    document.getElementById('deffererBtn').addEventListener('click', function () {
-        chrome.runtime.getBackgroundPage(function (bg) {
-            let defList = bg.deferredRestrictionsList;
-            if (defList == undefined)
-                defList = [];
-            defList.push({ site: blockSiteUrl, dateOfDeferred: new Date().getTime()});
+    storage.getValue(SETTINGS_BLOCK_DEFERRAL, function(item) { 
+        var deferBtn = document.getElementById('deffererBtn');
+        if (item){
+            deferBtn.addEventListener('click', function () {
+                chrome.runtime.getBackgroundPage(function (bg) {
+                    let defList = bg.deferredRestrictionsList;
+                    if (defList == undefined)
+                        defList = [];
+                    defList.push({ site: blockSiteUrl, dateOfDeferred: new Date().getTime()});
 
-            bg.deferredRestrictionsList = defList;
+                    bg.deferredRestrictionsList = defList;
 
-            chrome.tabs.query({ currentWindow: true, active: true }, function(tab) {
-                chrome.tabs.update(tab.id, { url: blockSiteUrl });
+                    chrome.tabs.query({ currentWindow: true, active: true }, function(tab) {
+                        chrome.tabs.update(tab.id, { url: blockSiteUrl });
+                    });
+                });
             });
-        });
+        } else {
+            deferBtn.remove();
+        }
     });
 });

src/scripts/common.js

@@ -41,6 +41,7 @@ var SETTINGS_INTERVAL_CHECK_DEFAULT = 1000;
 var SETTINGS_INTERVAL_SAVE_STORAGE_DEFAULT = 5000;
 var SETTINGS_INTERVAL_RANGE_DEFAULT = RangeForDays.days7;
 var SETTINGS_VIEW_TIME_IN_BADGE_DEFAULT = true;
+var SETTINGS_BLOCK_DEFERRAL_DEFAULT = true;
 var SETTINGS_DARK_MODE_DEFAULT = false;
 var SETTINGS_SHOW_HINT_DEFAULT = true;
 var STORAGE_NOTIFICATION_MESSAGE_DEFAULT = 'You have spent a lot of time on this site';
@@ -50,6 +51,7 @@ var SETTINGS_INTERVAL_SAVE_STORAGE = 'interval_save_in_storage';
 var SETTINGS_INTERVAL_RANGE = 'range_days';
 var SETTINGS_DARK_MODE = 'night_mode';
 var SETTINGS_VIEW_TIME_IN_BADGE = 'view_time_in_badge';
+var SETTINGS_BLOCK_DEFERRAL = 'view_block_deferral';
 var SETTINGS_SHOW_HINT = 'show_hint';
 
 function isEmpty(obj) {

src/scripts/settings.js

@@ -49,6 +49,9 @@ document.addEventListener('DOMContentLoaded', function () {
     document.getElementById('viewTimeInBadge').addEventListener('change', function () {
         storage.saveValue(SETTINGS_VIEW_TIME_IN_BADGE, this.checked);
     });
+    document.getElementById('blockDeferral').addEventListener('change', function () {
+        storage.saveValue(SETTINGS_BLOCK_DEFERRAL, this.checked);
+    });
     document.getElementById('darkMode').addEventListener('change', function () {
         storage.saveValue(SETTINGS_DARK_MODE, this.checked);
     });
@@ -100,6 +103,9 @@ function loadSettings() {
     storage.getValue(SETTINGS_VIEW_TIME_IN_BADGE, function (item) {
         document.getElementById('viewTimeInBadge').checked = item;
     });
+    storage.getValue(SETTINGS_BLOCK_DEFERRAL, function (item) {
+        document.getElementById('blockDeferral').checked = item;
+    });
     storage.getValue(SETTINGS_DARK_MODE, function (item) {
         document.getElementById('darkMode').checked = item;
     });