[Pkg-mozext-commits] [adblock-plus] 40/52: Issue 1814 - Use ext.showOptions() on the first-run page

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit af1d3fcfa4d00a9c6f2698e0661a9cff8a0726b6
Author: Wladimir Palant <trev at adblockplus.org>
Date:   Thu Jan 15 13:52:49 2015 +0100

    Issue 1814 - Use ext.showOptions() on the first-run page
    
    --HG--
    extra : rebase_source : bf8ae0ccd10520b52274cafe6f517227b5da2b5a
---
 background.js       | 5 -----
 ext/background.js   | 5 +++++
 messageResponder.js | 7 +------
 3 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/background.js b/background.js
index 8c28962..1d9bcb8 100644
--- a/background.js
+++ b/background.js
@@ -163,11 +163,6 @@
   };
   updateFromURL(modules.info);
 
-  global.openOptions = function()
-  {
-    window.open("http://example.com/options.html", "_blank");
-  };
-
   global.Services = {
     vc: {
       compare: function(v1, v2)
diff --git a/ext/background.js b/ext/background.js
index 55e9d08..02cbcc5 100644
--- a/ext/background.js
+++ b/ext/background.js
@@ -75,4 +75,9 @@
   };
 
   global.ext.PageMap = PageMap;
+
+  global.ext.showOptions = function()
+  {
+    window.open("http://example.com/options.html", "_blank");
+  };
 })(this);
diff --git a/messageResponder.js b/messageResponder.js
index 9b0e2e9..cf11a1b 100644
--- a/messageResponder.js
+++ b/messageResponder.js
@@ -120,12 +120,7 @@
         break;
       case "app.open":
         if (message.what == "options")
-        {
-          if (typeof global.openOptions == "function")
-            global.openOptions();
-          else
-            require("ui").UI.openFiltersDialog();
-        }
+          ext.showOptions();
         break;
       case "subscriptions.get":
         var subscriptions = FilterStorage.subscriptions.filter(function(s)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git