Issue 6786 - Display the Safari App Extension migration page

safari/ext/background.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
@@ skipping 570 matching lines @@
     if (event.oldValue != null)
       change.oldValue = event.oldValue;
     if (event.newValue != null)
       change.newValue = event.newValue;
 
     ext.storage.onChanged._dispatch(changes);
   });
 
 
   /* Options */
-
-  ext.showOptions = function(callback)
+  ext.showPage = function(url, callback)
   {
-    var optionsUrl = safari.extension.baseURI + "options.html";
-
     for (var id in pages)
     {
       var page = pages[id];
       var tab = page._tab;
 
-      if (page.url.href == optionsUrl && tab.browserWindow == safari.application.activeBrowserWindow)
+      if (page.url.href == url && tab.browserWindow == safari.application.activeBrowserWindow)

[Sebastian Noack, 2018/07/13 18:04:18]

I just figured, this wouldn't work anyway as expected if a redirect is involved.

[Sebastian Noack, 2018/07/13 18:06:37]

Ignore that comment. It actually would work, since you pass in the destination
URL determined through the fetch() API.

[kzar, 2018/07/13 18:44:04]

Yes, I originally made that mistake but noticed it during testing.

       {
         tab.activate();
         if (callback)
           callback(page);
         return;
       }
     }
 
-    ext.pages.open(optionsUrl, callback);
+    ext.pages.open(url, callback);
   };
 
+  ext.showOptions = ext.showPage.bind(this, safari.extension.baseURI + "options.html");
+
   /* Windows */
   ext.windows = {
     // Safari doesn't provide as rich a windows API as Chrome does, so instead
     // of chrome.windows.create we have to fall back to just opening a new tab.
     create: function(createData, callback)
     {
       ext.pages.open(createData.url, callback);
     }
   };
 })();