Issue 4680 - Fixed regression with showOptions callback

chrome/ext/background.js

 /*
  * This file is part of Adblock Plus <https://adblockplus.org/>,
  * Copyright (C) 2006-2016 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 586 matching lines @@
     {
       chrome.storage.local.remove(key, callback);
     },
     onChanged: chrome.storage.onChanged
   };
 
   /* Options */
 
   if ("openOptionsPage" in chrome.runtime)
   {
-    ext.showOptions = chrome.runtime.openOptionsPage;
+    ext.showOptions = function(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)
+            {
+              window.setTimeout(() =>

[kzar, 2016/12/09 10:08:21]

(Necessary for the notification preferences option to be highlighted correctly
when the tab is first open.)

+              {
+                callback(new Page(tabs[0]));
+              });
+            }
+          });
+        });
+      }
+    };
   }
   else
   {
     // Edge does not yet support runtime.openOptionsPage (tested version 38)
     // and so this workaround needs to stay for now.
     ext.showOptions = function(callback)
     {
       chrome.windows.getLastFocused(function(win)
       {
         var optionsUrl = chrome.extension.getURL("options.html");
@@ skipping 30 matching lines @@
   ext.windows = {
     create: function(createData, callback)
     {
       chrome.windows.create(createData, function(createdWindow)
       {
         afterTabLoaded(callback)(createdWindow.tabs[0]);
       });
     }
   };
 })();