Issue 6933 - Update adblockpluscore dependency to hg:dcda4859fcbd

lib/filterComposer.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-present 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/>.
  */
 
 /** @module filterComposer */
 
 "use strict";
 
 const {defaultMatcher} = require("../adblockpluscore/lib/matcher");
 const {RegExpFilter} = require("../adblockpluscore/lib/filterClasses");
-const {FilterNotifier} = require("../adblockpluscore/lib/filterNotifier");
+const {filterNotifier} = require("../adblockpluscore/lib/filterNotifier");
 const {Prefs} = require("./prefs");
 const {extractHostFromFrame, isThirdParty} = require("./url");
 const {getKey, checkWhitelisted} = require("./whitelisting");
 const {port} = require("./messaging");
 const info = require("info");
 
 let readyPages = new ext.PageMap();
 
 /**
  * Checks whether the given page is ready to use the filter composer
@@ skipping 147 matching lines @@
 
   // We don't support the filter composer on Firefox for Android, because the
   // user experience on mobile is quite different.
   if (info.application != "fennec" &&
       !filter && Prefs.shouldShowBlockElementMenu && readyPages.has(page))
   {
     page.contextMenus.create(contextMenuItem);
   }
 }
 
-FilterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu);
+filterNotifier.on("page.WhitelistingStateRevalidate", updateContextMenu);
 
 Prefs.on("shouldShowBlockElementMenu", () =>
 {
   browser.tabs.query({}, tabs =>
   {
     for (let tab of tabs)
       updateContextMenu(new ext.Page(tab));
   });
 });
 
@@ skipping 128 matching lines @@
   // When tabs start loading we send them a message to ensure that the state
   // of the "block element" tool is reset. This is necessary since Firefox will
   // sometimes cache the state of a tab when the user navigates back / forward,
   // which includes the state of the "block element" tool.
   // Since sending this message will often fail (e.g. for new tabs which have
   // just been opened) we catch and ignore any exception thrown.
   browser.tabs.sendMessage(
     page.id, {type: "composer.content.finished"}
   ).catch(() => {});
 });