Issue 5803 - rename desktop options page to desktop-options.*

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 382 matching lines @@
     reinitialized: params.filterlistsReinitialized
   };
 
   modules.messaging = {
     port: new EventEmitter()
   };
 
   modules.options = {
     showOptions(callback)
     {
-      if (!/\/(mobile-)?options\.html\b/.test(top.location.href))

[Thomas Greiner, 2017/10/06 17:05:50]

Detail: We can keep the `\b` at the end of the regex unless it's causing issues.

[saroyanm, 2017/10/06 17:28:27]

Done.

+      if (!/\/(?:mobile|desktop)-options\.html/.test(top.location.href))
         window.open("options.html", "_blank");

[Thomas Greiner, 2017/10/06 17:05:50]

There is no options.html in the adblockplusui repository so we need to rename it
to desktop-options.html here too.

[saroyanm, 2017/10/06 17:28:27]

done.

 
       if (callback)
         callback();
     }
   };
 
   window.addEventListener("message", (event) =>
   {
     if (event.data.type != "message")
       return;
@@ skipping 186 matching lines @@
       },
       filter: {
         text: "||example.com/some-annoying-popup$popup",
         whitelisted: false,
         userDefined: true,
         subscription: null
       }
     });
   });
 }());