Fixed: Topic 12380 - No image preview in list of blockable items

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 286 matching lines @@
   showPreview = showPreview && (!item.filter || item.filter.disabled || item.filter instanceof WhitelistFilter);
   if (showPreview)
   {
     // Check whether image is in cache (stolen from ImgLikeOpera)
     if (!cacheSession)
     {
       var cacheService = Cc["@mozilla.org/network/cache-service;1"].getService(Ci.nsICacheService);
       cacheSession = cacheService.createSession("HTTP", Ci.nsICache.STORE_ANYWHERE, true);
     }
 
-    let cacheListener = {

[Wladimir Palant, 2013/11/26 11:35:31]

Style nit: this bracket should be on the next line.

[Thomas Greiner, 2013/11/29 14:35:44]

Done.

+    let cacheListener =
+    {
        onCacheEntryAvailable: function(descriptor, accessGranted, status)
        {
           if (!descriptor)
             return;
 
           descriptor.close();
           // Show preview here since this is asynchronous now
           // and we have a valid descriptor
           E("tooltipPreview").setAttribute("src", item.location);
+          E("tooltipPreviewBox").hidden = false;
        },
        onCacheEntryDoomed: function(status)
        {
        }
     };
     try
     {
       cacheSession.asyncOpenCacheEntry(item.location, Ci.nsICache.ACCESS_READ, cacheListener);
     }
     catch (e)
     {
-      showPreview = false;

[Wladimir Palant, 2013/11/26 11:35:31]

This should normally never happen, please add Cu.reportError(e) here to make
sure the error isn't swallowed.

[Thomas Greiner, 2013/11/29 14:35:44]

Done.

-    }
-  }
-
-  if (showPreview)
-  {
-    E("tooltipPreviewBox").hidden = false;
-    E("tooltipPreview").setAttribute("src", "");
-  }
-  else
-    E("tooltipPreviewBox").hidden = true;

[Wladimir Palant, 2013/11/26 11:35:31]

We should not show the preview box at all if we aren't sure that there will be a
preview. In other words, you should always do |E("tooltipPreviewBox").hidden =
true| first and only do |E("tooltipPreviewBox").hidden = false| and set image
src in onCacheEntryAvailable.

[Thomas Greiner, 2013/11/29 14:35:44]

Done.

+      Cu.reportError(e);
+    }
+  }
+
+  E("tooltipPreviewBox").hidden = true;
 }
 
 const visual = {
   OTHER: true,
   IMAGE: true,
   SUBDOCUMENT: true
 }
 
 /**
  * Updates context menu before it is shown.
@@ skipping 892 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }