Merge branch 'dev-without-permissions' of https://bitbucket.org/Stigmat/chrome_extension into dev

Author: hai-altx-soft

manifest.json

@@ -3,7 +3,7 @@
 
         "name": "Web Activity Time Tracker",
         "short_name": "Web Activity",
-        "version": "0.8.0",
+        "version": "0.8.1",
         "minimum_chrome_version": "26",
 
         "description": "Track your activity in the browser.",
@@ -23,9 +23,12 @@
             "idle",
             "chrome://favicon/*",
             "webNavigation",
-            "unlimitedStorage",
-            "<all_urls>"
+            "unlimitedStorage"
         ],
+        "optional_permissions": [
+            "http://*/*",
+            "https://*/*"
+          ],
         "offline_enabled": true,
         "background": {
             "scripts": ["scripts/common.js", 

options.html

@@ -81,6 +81,20 @@
                <div class="margin-top-10">
                   <input type="button" value="Export to CSV" id='exportToCsv'>
                </div>
+               <div class="margin-top-10">
+                  <label class="block">Web Activity Time Tracker tracks your activity, if you active in browser (mouse
+                     or keyboard).
+                     In order for the extension to also track when you watch a video, you must grant permissions to
+                     access the sites.
+                     It is necessary that extension will get access to DOM (Document Object Model).</label>
+                  <input class="margin-top-10" type="button" value="Grant permission" id='grantPermission'>
+                  <div class="inline-block">
+                     <div id='permissionSuccessedBlock' hidden>
+                        <img src="/icons/success.png" height="18" />
+                        <label>Permissions have been granted</label>
+                     </div>
+                  </div>
+               </div>
                <div class="margin-top-10">
                   <label>Data in memory use </label><label id='memoryUse'></label>
                </div>
@@ -132,9 +146,11 @@
                      <input type="hidden" name="business" value="JBQEMTYGHGJVS" />
                      <input type="hidden" name="item_name" value="Web Activity Time Tracker" />
                      <input type="hidden" name="currency_code" value="USD" />
-                     <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0" name="submit" title="PayPal - The safer, easier way to pay online!" alt="Donate with PayPal button" />
+                     <input type="image" src="https://www.paypalobjects.com/en_US/i/btn/btn_donateCC_LG.gif" border="0"
+                        name="submit" title="PayPal - The safer, easier way to pay online!"
+                        alt="Donate with PayPal button" />
                      <img alt="" border="0" src="https://www.paypal.com/en_US/i/scr/pixel.gif" width="1" height="1" />
-                     </form>
+                  </form>
                </div>
             </div>
          </div>

scripts/background.js

@@ -104,13 +104,24 @@ function isVideoPlayedOnPage() {
 
 function checkDOM(state, activeUrl, tab, activeTab) {
     if (state === 'idle') {
-        chrome.tabs.executeScript({ code: "var videoElement = document.getElementsByTagName('video')[0]; (videoElement !== undefined && videoElement.currentTime > 0 && !videoElement.paused && !videoElement.ended && videoElement.readyState > 2);" }, (results) => {
-            if (results !== undefined && results[0] !== undefined && results[0] === true)
-                mainTRacker(activeUrl, tab, activeTab);
-        });
+        checkPermissions(mainTRacker, activeUrl, tab, activeTab);
     }
 }
 
+function checkPermissions(callback, activeUrl, tab, activeTab){
+    chrome.permissions.contains({
+        permissions: ['tabs'],
+        origins: ["http://*/*", "https://*/*"]
+      }, function(result) {
+        if (result) {
+            chrome.tabs.executeScript({ code: "var videoElement = document.getElementsByTagName('video')[0]; (videoElement !== undefined && videoElement.currentTime > 0 && !videoElement.paused && !videoElement.ended && videoElement.readyState > 2);" }, (results) => {
+                if (results !== undefined && results[0] !== undefined && results[0] === true)
+                callback(activeUrl, tab, activeTab);
+            });
+        }
+      });
+}
+
 function backgroundUpdateStorage() {
     if (tabs != undefined && tabs.length > 0)
         storage.saveTabs(tabs);

scripts/settings.js

@@ -36,6 +36,9 @@ document.addEventListener('DOMContentLoaded', function () {
     document.getElementById('rangeToDays').addEventListener('change', function () {
         storage.saveSettings(SETTINGS_INTERVAL_RANGE, this.value);
     });
+    document.getElementById('grantPermission').addEventListener('click', function () {
+        grantPermission();
+    });
     $('.clockpicker').clockpicker();
 
     loadSettings();
@@ -81,6 +84,18 @@ function loadSettings() {
             restrictionList = [];
         viewRestrictionList(items);
     });
+    checkPermissions();
+}
+
+function checkPermissions() {
+    chrome.permissions.contains({
+        permissions: ['tabs'],
+        origins: ["http://*/*", "https://*/*"]
+    }, function (result) {
+        if (result) {
+            setUIForAnyPermission();
+        }
+    });
 }
 
 function loadVersion() {
@@ -96,6 +111,23 @@ function viewBlackList(items) {
     }
 }
 
+function grantPermission() {
+    chrome.permissions.request({
+        permissions: ['tabs'],
+        origins: ["http://*/*", "https://*/*"]
+    }, function (granted) {
+        // The callback argument will be true if the user granted the permissions.
+        if (granted) {
+            setUIForAnyPermission();
+        }
+    });
+}
+
+function setUIForAnyPermission() {
+    document.getElementById('permissionSuccessedBlock').hidden = false;
+    document.getElementById('grantPermission').setAttribute('disabled', 'true');
+}
+
 function viewRestrictionList(items) {
     if (items !== undefined) {
         for (var i = 0; i < items.length; i++) {
@@ -104,27 +136,27 @@ function viewRestrictionList(items) {
     }
 }
 
-function exportToCSV(){
+function exportToCSV() {
     storage.getSettings(STORAGE_TABS, function (item) {
         toCsv(item);
     });
 }
 
-function toCsv(tabsData){
+function toCsv(tabsData) {
     var str = 'domain,time(sec)\r\n';
     for (var i = 0; i < tabsData.length; i++) {
         var line = tabsData[i].url + ',' + tabsData[i].summaryTime;
         str += line + '\r\n';
     }
-    
-    var csvFile = new Blob([str], {type:"text/csv"});
+
+    var csvFile = new Blob([str], { type: "text/csv" });
     var downloadLink;
-	downloadLink = document.createElement("a");
-	downloadLink.download = 'domains.csv';
-	downloadLink.href = window.URL.createObjectURL(csvFile);
-	downloadLink.style.display = "none";
-	document.body.appendChild(downloadLink);
-	downloadLink.click();
+    downloadLink = document.createElement("a");
+    downloadLink.download = 'domains.csv';
+    downloadLink.href = window.URL.createObjectURL(csvFile);
+    downloadLink.style.display = "none";
+    document.body.appendChild(downloadLink);
+    downloadLink.click();
 }
 
 function clearAllData() {

style/settings.css

@@ -181,6 +181,13 @@ input[type="button"]:hover {
     text-decoration: none;
   }
 
+  
+  input[type="button"][disabled]{
+    border: 1px solid #999999;
+    background-color: #cccccc;
+    color: #666666;
+  }
+
 .margin-top-10{
       margin-top: 10px;
   }
@@ -237,6 +244,10 @@ input[type="button"]:hover {
     opacity: 1;
   }
 
+  .hidden{
+      display: none;
+  }
+
   .notify{
     width: 200px;
     height: 27px;