Issue 4864 - Start using ESLint for adblockpluschrome

lib/popupBlocker.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
- * Copyright (C) 2006-2016 Eyeo GmbH
+ * Copyright (C) 2006-2017 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.
  *
@@ skipping 53 matching lines @@
 
   logRequest(
     popup.sourcePage, urlString, "POPUP",
     documentHost, thirdParty, null,
     specificOnly, filter
   );
 }
 
 function onPopupURLChanged(details)
 {
+  // Ignore frames inside the popup window.
+  if (details.frameId != 0)
+    return;
+
   let popup = loadingPopups[details.tabId];
   if (popup)
   {
     popup.url = details.url;
     if (popup.sourceFrame)
       checkPotentialPopup(details.tabId, popup);
   }
 }
 
 function onCompleted(details)
@@ skipping 20 matching lines @@
 
   let {tabId} = details;
   let popup = loadingPopups[tabId] = {
     url: details.url,
     sourcePage: new ext.Page({id: details.sourceTabId}),
     sourceFrame: null
   };
   let frame = ext.getFrame(details.sourceTabId, details.sourceFrameId);
 
   if (checkWhitelisted(popup.sourcePage, frame))
+  {
     forgetPopup(tabId);
+  }
   else
   {
     popup.sourceFrame = frame;
     checkPotentialPopup(tabId, popup);
   }
 });