[Pkg-mozext-commits] [adblock-plus] 29/87: Issue 3719 - Adapt for changes in the initilization code on Chrome/Safari

[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 42e195e441fc3524496918883a7a744edfdd7f35
Author: Sebastian Noack <sebastian at adblockplus.org>
Date:   Mon Mar 14 12:55:24 2016 +0100

    Issue 3719 - Adapt for changes in the initilization code on Chrome/Safari
---
 README.md                  |  4 ++--
 firstRun.html              |  1 -
 firstRun.js                | 10 ----------
 locale/en-US/firstRun.json |  5 +----
 messageResponder.js        |  4 ++--
 5 files changed, 5 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index ac3402c..d0a2fd2 100644
--- a/README.md
+++ b/README.md
@@ -65,8 +65,8 @@ The behavior of this page is affected by a number of URL parameters:
 * `platform`, `platformVersion`, `application`, `applicationVersion`: sets
   application parameters that are normally determined by Adblock Plus. Using
   `?platform=safari&platformVersion=5.0` should trigger a warning.
-* `seenDataCorruption`, `filterlistsReinitialized`: setting these parameters to
-  `true` should trigger warnings referring to issues detected by Adblock Plus.
+* `filterlistsReinitialized`: setting these parameters to `true` should
+  trigger warnings referring to issues detected by Adblock Plus.
 * `blockedURLs`: a comma-separated list of URLs that should be considered
   blocked (necessary to test the check for blocked scripts in sharing buttons).
 
diff --git a/firstRun.html b/firstRun.html
index 893374f..16e8c85 100644
--- a/firstRun.html
+++ b/firstRun.html
@@ -39,7 +39,6 @@
 
     <section id="legacySafariWarning" class="i18n_firstRun_legacySafariWarning warning" hidden="true"></section>
     <section id="filterlistsReinitializedWarning" class="i18n_firstRun_filterlistsReinitializedWarning warning" hidden="true"></section>
-    <section id="dataCorruptionWarning" class="i18n_firstRun_dataCorruptionWarning warning" hidden="true"></section>
 
     <div id="content">
       <section id="general">
diff --git a/firstRun.js b/firstRun.js
index 91b0a8b..dc42b3c 100644
--- a/firstRun.js
+++ b/firstRun.js
@@ -80,16 +80,6 @@
       what: "issues"
     }, function(issues)
     {
-      // Show warning if data corruption was detected
-      if (issues.seenDataCorruption)
-      {
-        E("dataCorruptionWarning").removeAttribute("hidden");
-        getDocLink("knownIssuesChrome_filterstorage", function(link)
-        {
-          setLinks("dataCorruptionWarning", link);
-        });
-      }
-
       // Show warning if filterlists settings were reinitialized
       if (issues.filterlistsReinitialized)
       {
diff --git a/locale/en-US/firstRun.json b/locale/en-US/firstRun.json
index 81914a3..817c1b4 100644
--- a/locale/en-US/firstRun.json
+++ b/locale/en-US/firstRun.json
@@ -17,9 +17,6 @@
   "firstRun_contributor_credits": {
     "message": "Contributor Credits"
   },
-  "firstRun_dataCorruptionWarning": {
-    "message": "Does this page keep showing up? <a>Click here!</a>"
-  },
   "firstRun_donate": {
     "message": "donate"
   },
@@ -68,4 +65,4 @@
   "firstRun_toggle_on": {
     "message": "ON"
   }
-}
\ No newline at end of file
+}
diff --git a/messageResponder.js b/messageResponder.js
index ebbeb63..50a9196 100644
--- a/messageResponder.js
+++ b/messageResponder.js
@@ -143,10 +143,10 @@
       case "app.get":
         if (message.what == "issues")
         {
+          var subscriptionInit = require("subscriptionInit");
           var info = require("info");
           callback({
-            seenDataCorruption: "seenDataCorruption" in global ? global.seenDataCorruption : false,
-            filterlistsReinitialized: "filterlistsReinitialized" in global ? global.filterlistsReinitialized : false,
+            filterlistsReinitialized: subscriptionInit ? subscriptionInit.reinitialized : false,
             legacySafariVersion: (info.platform == "safari" && (
                 Services.vc.compare(info.platformVersion, "6.0") < 0 ||   // beforeload breaks websites in Safari 5
                 Services.vc.compare(info.platformVersion, "6.1") == 0 ||  // extensions are broken in 6.1 and 7.0

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