From d47d8bf0bf24196bcc908b995c513ecc9ad4fdc9 Mon Sep 17 00:00:00 2001
From: gorhill <rhill@raymondhill.net>
Date: Sat, 2 May 2015 17:41:52 -0400
Subject: [PATCH] this fixes #158

---
 src/_locales/en/messages.json |  4 ++++
 src/js/async.js               |  2 ++
 src/js/background.js          |  1 +
 src/js/httpsb.js              | 20 --------------------
 src/settings.html             |  3 +++
 5 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json
index ea37bf7..6a94af9 100644
--- a/src/_locales/en/messages.json
+++ b/src/_locales/en/messages.json
@@ -299,6 +299,10 @@
         "message": "Opacity",
         "description": "English: Opacity"
     },
+    "settingsIconBadgeEnabled":{
+        "message":"Show the number of distinct requests on the icon",
+        "description":"English: Show the number of distinct requests on the icon"
+    },
     "settingsCollapseBlocked" : {
         "message": "Collapse placeholder of blocked elements",
         "description": "English: Collapse placeholder of blocked elements"
diff --git a/src/js/async.js b/src/js/async.js
index a13eb57..5366eb8 100644
--- a/src/js/async.js
+++ b/src/js/async.js
@@ -153,6 +153,8 @@ return asyncJobManager;
                 var squareSize = 19;
                 var greenSize = squareSize * Math.sqrt(pageStore.perLoadAllowedRequestCount / total);
                 iconId = greenSize < squareSize/2 ? Math.ceil(greenSize) : Math.floor(greenSize);
+            }
+            if ( this.userSettings.iconBadgeEnabled && pageStore.distinctRequestCount !== 0) {
                 badgeStr = this.formatCount(pageStore.distinctRequestCount);
             }
         }
diff --git a/src/js/background.js b/src/js/background.js
index 0e3d66e..314df4b 100644
--- a/src/js/background.js
+++ b/src/js/background.js
@@ -61,6 +61,7 @@ return {
         deleteLocalStorage: false,
         displayTextSize: '13px',
         externalHostsFiles: '',
+        iconBadgeEnabled: true,
         maxLoggedRequests: 50,
         popupCollapseDomains: false,
         popupCollapseSpecificDomains: {},
diff --git a/src/js/httpsb.js b/src/js/httpsb.js
index 16b2ac2..b2fd0aa 100644
--- a/src/js/httpsb.js
+++ b/src/js/httpsb.js
@@ -60,26 +60,6 @@
 };
 
 
-/******************************************************************************/
-
-µMatrix.transposeType = function(type, path) {
-    if ( type !== 'other' ) {
-        return type;
-    }
-    var pos = path.lastIndexOf('.');
-    if ( pos === -1 ) {
-        return 'other';
-    }
-    var ext = path.slice(pos) + '.';
-    if ( '.css.eot.ttf.otf.svg.woff.woff2.'.indexOf(ext) !== -1 ) {
-        return 'css';
-    }
-    if ( '.ico.png.gif.jpg.jpeg.bmp.'.indexOf(ext) !== -1 ) {
-        return 'image';
-    }
-    return type;
-};
-
 /******************************************************************************/
 
 // Whitelist something
diff --git a/src/settings.html b/src/settings.html
index cded1f6..8e9e7d6 100644
--- a/src/settings.html
+++ b/src/settings.html
@@ -38,6 +38,9 @@ ul > li {
 
 <h2 data-i18n="settingsMatrixConvenienceHeader"></h2>
 <ul>
+    <li>
+        <input id="iconBadgeEnabled" type="checkbox" data-range="bool">
+        <label data-i18n="settingsIconBadgeEnabled" for="iconBadgeEnabled"></label>
     <li>
         <input id="collapseBlocked" type="checkbox" data-range="bool">
         <label data-i18n="settingsCollapseBlocked" for="collapseBlocked"></label>