From 04fc762427253a406472f39a06ade510dcc27012 Mon Sep 17 00:00:00 2001
From: Lukas Winkler <l.winkler23@mailbox.org>
Date: Sun, 13 Aug 2017 19:06:35 +0200
Subject: [PATCH] show piwik URL

---
 js/inject.js     | 15 ++++++++++-----
 js/panel.js      | 21 ++++++++++++++-------
 views/panel.html |  9 +++++----
 3 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/js/inject.js b/js/inject.js
index 110fb9b..ad18dc0 100644
--- a/js/inject.js
+++ b/js/inject.js
@@ -71,11 +71,16 @@ tests = {
             return false;
         }
         return {
-            piwikUsesHTTPS: this.piwikUsesHTTPS(),
-            noProtocolRelativeURL: this.noProtocolRelativeURL(),
-            noMixedContent: this.noMixedContent(),
-            isScriptAsync: this.isScriptAsync(),
-            isPageUTF8: this.isPageUTF8()
+            info: {
+                piwikURL: this.URLtoPiwikJS()
+            },
+            results: {
+                piwikUsesHTTPS: this.piwikUsesHTTPS(),
+                noProtocolRelativeURL: this.noProtocolRelativeURL(),
+                noMixedContent: this.noMixedContent(),
+                isScriptAsync: this.isScriptAsync(),
+                isPageUTF8: this.isPageUTF8()
+            }
         };
     }
 };
diff --git a/js/panel.js b/js/panel.js
index 946e6b3..a4da6a1 100644
--- a/js/panel.js
+++ b/js/panel.js
@@ -7,9 +7,9 @@ document.addEventListener('DOMContentLoaded', function() {
             var tbl = document.querySelector('.table');
             tbl.innerHTML = "";
 
-            for (var testname in data.inject) {
-                if (data.inject.hasOwnProperty(testname)) {
-                    var response = data.inject[testname];
+            for (var testname in data.tests) {
+                if (data.tests.hasOwnProperty(testname)) {
+                    var response = data.tests[testname];
                     var tr = tbl.insertRow();
                     tr.title = testname;
                     var status = tr.insertCell(0), details = tr.insertCell(1);
@@ -48,10 +48,11 @@ document.addEventListener('DOMContentLoaded', function() {
         // Listen to messages from the background page
         port.onMessage.addListener(function(message) {
             if (message.action === 'injectResponse') {
-                data.inject = message.data;
+                data.tests = message.data.results;
+                data.info = message.data.info;
                 var piwikNotFoundHeading = document.getElementById("piwikNotFoundHeading");
                 var piwikNotFound = document.getElementById("piwikNotFound");
-                if (!data.inject) {
+                if (!data.tests) {
                     piwikNotFoundHeading.innerText = chrome.i18n.getMessage("piwikNotFoundHeading");
                     piwikNotFound.innerText = chrome.i18n.getMessage("piwikNotFound");
                     piwikNotFound.style.display = "inline-block";
@@ -59,7 +60,13 @@ document.addEventListener('DOMContentLoaded', function() {
                 } else {
                     piwikNotFound.style.display = "none";
                     piwikNotFoundHeading.style.display = "none";
-
+                    var urlElement = document.getElementById("piwikURL");
+                    urlElement.innerText = data.info.piwikURL;
+                    if (data.tests.noProtocolRelativeURL.success) {
+                        urlElement.href = data.info.piwikURL.slice(0, -8); // remove "piwik.js" from link
+                    } else {
+                        urlElement.href = "https:" + data.info.piwikURL.slice(0, -8);
+                    }
                 }
                 // port.postMessage(message);
             } else if (message.action === "requestResponse" && message.file) {
@@ -73,7 +80,7 @@ document.addEventListener('DOMContentLoaded', function() {
     chrome.runtime.sendMessage({action: "inject", tabId: chrome.devtools.inspectedWindow.tabId});
     chrome.runtime.sendMessage({action: "request", tabId: chrome.devtools.inspectedWindow.tabId});
     document.querySelector('#start').addEventListener('click', function() {
+        chrome.devtools.inspectedWindow.reload();
         chrome.runtime.sendMessage({action: "inject", tabId: chrome.devtools.inspectedWindow.tabId});
-        // chrome.runtime.sendMessage({action: "request", tabId: chrome.devtools.inspectedWindow.tabId});
     }, false);
 });
diff --git a/views/panel.html b/views/panel.html
index f167da2..064a7ec 100644
--- a/views/panel.html
+++ b/views/panel.html
@@ -6,8 +6,8 @@
 		<style>
 			button {
 				position: absolute;
-				top:5px;
-				right:5px;
+				top: 5px;
+				right: 5px;
 			}
 		</style>
 		<script src="../js/panel.js"></script>
@@ -15,10 +15,11 @@
 	<body>
 		<div class="container">
 			<h2>Piwik Checker <span id="piwikNotFoundHeading" class="badge badge-warning"></span></h2>
+			<small><a href="#" id="piwikURL" target="_blank"></a></small>
 			<p id="piwikNotFound"></p>
-			<button  class="btn btn-secondary" id="start">Reload</button>
+			<button class="btn btn-secondary" id="start">Reload</button>
 			<table class="table"></table>
-			<samp id="json"></samp>
+			<pre id="json"></pre>
 
 		</div>
 	</body>