Issue 4864 - Start using ESLint for adblockpluschrome

chrome/ext/background.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.
  *
  * You should have received a copy of the GNU General Public License
  * along with Adblock Plus.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 "use strict";
 
+(function()
 {
   /* Pages */
 
   let Page = ext.Page = function(tab)
   {
     this.id = tab.id;
     this._url = tab.url && new URL(tab.url);
 
     this.browserAction = new BrowserAction(tab.id);
     this.contextMenus = new ContextMenus(this);
@@ skipping 284 matching lines @@
           {
             if (addedTabId == this._tabId)
             {
               chrome.tabs.onReplaced.removeListener(onReplaced);
               this._applyChanges();
             }
           };
           chrome.tabs.onReplaced.addListener(onReplaced);
         }
         else
+        {
           this._applyChanges();
+        }
       });
     },
     _addChange(name, value)
     {
       if (!this._changes)
       {
         this._changes = {};
         this._queueChanges();
       }
 
       this._changes[name] = value;
     },
     setIcon(path)
     {
       this._addChange("iconPath", path);
     },
     setBadge(badge)
     {
       if (!badge)
+      {
         this._addChange("badgeText", "");
+      }
       else
       {
         if ("number" in badge)
           this._addChange("badgeText", badge.number.toString());
 
         if ("color" in badge)
           this._addChange("badgeColor", badge.color);
       }
     }
   };
@@ skipping 176 matching lines @@
       let results = ext.webRequest.onBeforeRequest._dispatch(
         new URL(details.url),
         type.toUpperCase(),
         new Page({id: details.tabId}),
         frame
       );
 
       if (results.indexOf(false) != -1)
         return {cancel: true};
     }
-  }, {urls: ["http://*/*", "https://*/*"]}, ["blocking"]);
+  }, {urls: ["<all_urls>"]}, ["blocking"]);
 
 
   /* Message passing */
 
   chrome.runtime.onMessage.addListener((message, rawSender, sendResponse) =>
   {
     let sender = {};
 
     // Add "page" and "frame" if the message was sent by a content script.
     // If sent by popup or the background page itself, there is no "tab".
@@ skipping 44 matching lines @@
     onChanged: chrome.storage.onChanged
   };
 
   /* Options */
 
   if ("openOptionsPage" in chrome.runtime)
   {
     ext.showOptions = callback =>
     {
       if (!callback)
+      {
         chrome.runtime.openOptionsPage();
+      }
       else
       {
         chrome.runtime.openOptionsPage(() =>
         {
           if (chrome.runtime.lastError)
             return;
 
           chrome.tabs.query({active: true, lastFocusedWindow: true}, tabs =>
           {
             if (tabs.length > 0)
@@ skipping 31 matching lines @@
           {
             let tab = tabs[0];
 
             chrome.windows.update(tab.windowId, {focused: true});
             chrome.tabs.update(tab.id, {active: true});
 
             if (callback)
               callback(new Page(tab));
           }
           else
+          {
             ext.pages.open(optionsUrl, callback);
+          }
         });
       });
     };
   }
 
   /* Windows */
   ext.windows = {
     create(createData, callback)
     {
       chrome.windows.create(createData, createdWindow =>
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
-}
+}());