Fix delete restriction site

Author: hai-altx-soft

scripts/activity.js

@@ -34,18 +34,18 @@ class Activity {
         else return false;
     }
 
-    checkRestrictionIfAny(domain, tab){
+    isLimitExceeded(domain, tab){
         if (setting_restriction_list !== undefined && setting_restriction_list.length > 0){
              var item = setting_restriction_list.find(o => o.domain === domain);
              if (item !== undefined){
                  var today = new Date().toLocaleDateString();
                  var todayTimeUse = tab.days.find(x => x.date == today).summary;
-                 if (todayTimeUse > item.time){
-                     
+                 if (todayTimeUse >= item.time){
+                     return true;
                  }
              }
         }
-        else return false;
+        return false;
     }
 
     isNewUrl(domain) {

scripts/background.js

@@ -38,8 +38,8 @@ function backgroundCheck() {
                     activity.setCurrentActiveTab(tab.url);
                     chrome.idle.queryState(parseInt(setting_interval_inactivity), function (state) {
                         if (state === 'active') {
-                            if (activity.checkRestrictionIfAny(activeUrl, tab)){
-                                
+                            if (activity.isLimitExceeded(activeUrl, tab)){
+                                chrome.tabs.create({ url: chrome.runtime.getURL("block.html") })
                             }
                             if (!activity.isInBlackList(activeUrl))
                                 tab.incSummaryTime();

scripts/common.js

@@ -56,7 +56,7 @@ function convertTimeToSummaryTime(time) {
     var timeValue = time.split(':');
     var hour = timeValue[0];
     var min = timeValue[1];
-    var resultTimeValue;
+    var resultTimeValue = 0;
     if (hour > 0)
         resultTimeValue = hour * 60 * 3600;
     resultTimeValue += min * 60;

scripts/settings.js

@@ -211,7 +211,9 @@ function deleteBlackSite(e) {
 
 function deleteRestrictionSite(e) {
     var targetElement = e.path[1];
-    restrictionList.splice(restrictionList.indexOf(targetElement.innerText), 1);
+    var itemValue = targetElement.querySelector("[name='domain']").value;
+    var item = restrictionList.find(x => x.domain == itemValue);
+    restrictionList.splice(restrictionList.indexOf(item), 1);
     document.getElementById('restrictionsList').removeChild(targetElement);
     updateRestrictionList();
 }

scripts/webact.js

@@ -27,13 +27,11 @@ document.addEventListener('DOMContentLoaded', function () {
         getDataFromStorageByDays();
     });
     document.getElementById('settings').addEventListener('click', function () {
-        chrome.tabs.create({ url: chrome.runtime.getURL("block.html") })
-
-        // if (chrome.runtime.openOptionsPage) {
-        //     chrome.runtime.openOptionsPage();
-        // } else {
-        //     window.open(chrome.runtime.getURL('block.html'));
-        // }
+        if (chrome.runtime.openOptionsPage) {
+            chrome.runtime.openOptionsPage();
+        } else {
+            window.open(chrome.runtime.getURL('options.html'));
+        }
     });
 });