add ToutApp to blacklist + revert to old tracking-image detector algo…

…rithm
gdg · Jul 28, 2015 · 40f5f56 · 40f5f56
1 parent 85674a1
commit 40f5f56
Showing 1 changed file with 6 additions and 29 deletions.
diff --git a/scripts/main.js b/scripts/main.js
@@ -29,7 +29,9 @@ var pixelblock = (function(){
                    {name:'RJ Metrics',   pattern:'go.rjmetrics.com',       url:'http://rjmetrics.com'},
                    {name:'Mixpanel',     pattern:'api.mixpanel.com/track', url:'http://mixpanel.com'},
                    {name:'Front App',    pattern:'web.frontapp.com/api',   url:'http://frontapp.com'},
-                   {name:'Mailtrack.io', pattern:'mailtrack.io/trace',     url:'http://mailtrack.io'}];
+                   {name:'Mailtrack.io', pattern:'mailtrack.io/trace',     url:'http://mailtrack.io'},
+                   {name:'ToutApp',      pattern:'go.toutapp.com',         url:'http://toutapp.com'}
+                   ];
 
   /*
    * 
@@ -46,34 +48,9 @@ var pixelblock = (function(){
     });
 
     // block all images left over that are 1 x 1 (or less, regardless)
-    if (!blacklisted) {
-      var elem = $(img)[0];
-      // fetch all possible height values
-      var w1 = clean_height_width(elem.style.width);
-      var w2 = clean_height_width(elem.style.maxWidth);
-
-      var w3 = -1;
-      // check if width attr exists (otherwise dom always returns 0)
-      if(typeof $(img).attr('width') != 'undefined') {
-        w3 = clean_height_width(elem.width) ;
-      }
-
-      // fetch all possible width values
-      var h1 = clean_height_width(elem.style.height);
-      var h2 = clean_height_width(elem.style.maxHeight);
-
-      var h3 = -1;
-      // check if height attr exists (otherwise dom always returns 0)
-      if(typeof $(img).attr('height') != 'undefined') {
-        h3 = clean_height_width(elem.height);
-      }
-
-      if ( (w1 == 0 || w1 == 1 || w2 == 0 || w2 == 1 || w3 == 0 || w3 == 1) &&
-           (h1 == 0 || h1 == 1 || h2 == 0 || h2 == 1 || h3 == 0 || h3 == 1)
-      ) {
-        img.tracker_info = {pattern:'', name:'Unknown', url:''};
-        blacklisted = true;
-      }
+    if(!blacklisted && $(img).width() <= 1 && $(img).height() <= 1){
+      img.tracker_info = {pattern:'', name:'Unknown', url:''};
+      blacklisted = true;
     }
 
     // if blacklisted, hide image (ie. prevent the tracking img from loading)