Fix a data initialization issue (#8)

blupig · Aug 9, 2017 · cb31689 · cb31689
1 parent 6679c65
commit cb31689
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/certificate-info/background.js b/certificate-info/background.js
@@ -150,9 +150,9 @@ function displayPageInfo(tabId, pageProtocol, loading, validationData) {
     updateBadge(tabId, validationData['result_color'], validationData['validation_result_short']);
     updatePopupData(tabId, validationData['result_color'], validationData['validation_result'], validationData['cert_organization'], validationData['message']);
   } else {
-    // Clear badge
+    // Clear badge and popup data
     updateBadge(tabId, '', '');
-    updatePopupData(tabId, 'gray', 'No HTTP(S) page loaded', '', 'Certificate information will display here when you open an HTTPS page.');
+    delete popupData[tabId];
   }
 }
 

diff --git a/certificate-info/manifest.json b/certificate-info/manifest.json
@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "Certificate Info",
   "description": "Shows TLS certificate info and validation level of the servers you connect.",
-  "version": "0.0.8",
+  "version": "0.0.9",
 
   "icons": {
     "16": "icon_16.png",

diff --git a/certificate-info/popup.html b/certificate-info/popup.html
@@ -15,15 +15,15 @@
       }
       .title-box {
         color: #FFF;
-        background: #FF9800;
+        background: #888;
         padding: 4px;
         border-radius: 4px;
       };
     </style>
   </head>
   <body>
-    <p><span id="lblValidationResult" class="title-box">Validation Result</span></p>
-    <p style="margin-top: 18px;"><span id="lblCertOrganization"><b>Organization</b></span></p>
-    <p><span id="lblMessage">Message</span></p>
+    <p><span id="lblValidationResult" class="title-box">No HTTP(S) page loaded</span></p>
+    <p style="margin-top: 18px;"><span id="lblCertOrganization"><b></b></span></p>
+    <p><span id="lblMessage">Certificate information will display here when you open an HTTPS page.</span></p>
   </body>
 </html>
diff --git a/certificate-info/popup.js b/certificate-info/popup.js
@@ -21,6 +21,8 @@ document.addEventListener('DOMContentLoaded', function () {
   var currentTabId = background.currentTabId;
   var popupData = background.popupData[currentTabId];
 
+  if (typeof popupData === 'undefined') return;
+
   document.getElementById('lblValidationResult').style['background'] = popupData['color'];
   document.getElementById('lblValidationResult').innerHTML = popupData['validation_result'];
   document.getElementById('lblCertOrganization').innerHTML = '<b>' + popupData['cert_organization'] + '</b>';