Issue 3258 - Blockable items: restore item flashing functionality

chrome/content/ui/sidebar.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2015 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 // Main browser window
 var mainWin = parent;
 
 // The window handler currently in use
 var requestNotifier = null;
 
 var cacheStorage = null;
-var noFlash = false;
 
 // Matcher for disabled filters
 var disabledMatcher = new CombinedMatcher();
 
 // Cached string values
 var docDomainThirdParty = null;
 var docDomainFirstParty = null;
 
 // Localized type names
 var localizedTypes = new Map();
@@ skipping 79 matching lines @@
 function getFilter(item)
 {
   if ("filter" in item && item.filter)
     return Filter.fromText(item.filter);
   else
     return null;
 }
 
 // To be called on unload
 function cleanUp() {
-  flasher.stop();
   requestNotifier.shutdown();
   FilterNotifier.removeListener(reloadDisabledFilters);
   Prefs.removeListener(onPrefChange);
   E("list").view = null;
 
   let {removeBrowserLocationListener} = require("appSupport");
   if (removeBrowserLocationListener)
     removeBrowserLocationListener(mainWin, handleLocationChange);
   mainWin.removeEventListener("unload", mainUnload, false);
 }
@@ skipping 53 matching lines @@
   else
     E("copy-command").setAttribute("disabled", "true");
 
   if (item && window.content)
   {
     let key = item.location + " " + item.type + " " + item.docDomain;
     RequestNotifier.storeSelection(window.content, key);
     treeView.itemToSelect = null;
   }
 
-  if (!noFlash)
-    flasher.flash(item ? item.nodes : null);
+  if (requestNotifier)
+    requestNotifier.flashNodes(item ? item.ids : null, Prefs.flash_scrolltoitem);
 }
 
 function handleLocationChange()
 {
   if (requestNotifier)
     requestNotifier.shutdown();
 
   treeView.clearData();
 
   let {getBrowser, addBrowserLocationListener} = require("appSupport");
@@ skipping 869 matching lines @@
   addItem: function(/**RequestEntry*/ item, /**Boolean*/ scanComplete)
   {
     // Merge duplicate entries
     let key = item.location + " " + item.type + " " + item.docDomain;
     if (key in this.dataMap)
     {
       // We know this item already - take over the filter if any and be done with it
       let existing = this.dataMap[key];
       if (item.filter)
         existing.filter = item.filter;
+      existing.ids.push(item.id);
 
       this.invalidateItem(existing);
       return;
     }
 
     // Add new item to the list
     // Store original item in orig property - reading out prototype is messed up in Gecko 1.9.2
-    item = {__proto__: item, orig: item, nodes: []};
+    item = {__proto__: item, orig: item, nodes: [], ids: [item.id]};
     this.allData.push(item);
     this.dataMap[key] = item;
 
     // Show disabled filters if no other filter applies
     if (!item.filter)
     {
       let disabledMatch = disabledMatcher.matchesAny(item.location, RegExpFilter.typeMap[item.type], item.docDomain, item.thirdParty);
       if (disabledMatch)
         item.filter = disabledMatch.text;
     }
@@ skipping 169 matching lines @@
       return {tooltip: this.itemsDummyTooltip};
   },
 
   invalidateItem: function(item)
   {
     let row = this.data.indexOf(item);
     if (row >= 0)
       this.boxObject.invalidateRow(row);
   }
 }