From 46a249ebcfbb0c0f0a8b90f959821026b45dd783 Mon Sep 17 00:00:00 2001 From: uBlock <35694050+uBlockAdmin@users.noreply.github.com> Date: Mon, 24 Sep 2018 14:26:28 +0530 Subject: [PATCH] To stop survey page from opening --- platform/chromium/manifest.json | 2 +- src/js/background.js | 1 - src/js/start.js | 15 +-------------- 3 files changed, 2 insertions(+), 16 deletions(-) diff --git a/platform/chromium/manifest.json b/platform/chromium/manifest.json index ef04cbf17..2476baca9 100644 --- a/platform/chromium/manifest.json +++ b/platform/chromium/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "uBlock", - "version": "0.9.5.8", + "version": "0.9.5.9", "default_locale": "en", "description": "__MSG_extShortDesc__", diff --git a/src/js/background.js b/src/js/background.js index ef71c6a72..6f694321c 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -106,7 +106,6 @@ return { updateAssetsEvery: 97 * oneHour, projectServerRoot: 'https://raw.githubusercontent.com/uBlock-LLC/uBlock/master/', donationUrl: 'https://www.ublock.org/donate/', - surveyUrl:'https://www.ublock.org/update/', pslPath: 'assets/thirdparties/publicsuffix.org/list/effective_tld_names.dat', // permanent lists diff --git a/src/js/start.js b/src/js/start.js index 7d1e1ad6d..fd2e71130 100644 --- a/src/js/start.js +++ b/src/js/start.js @@ -208,32 +208,19 @@ var onInstalled = function() { var firstInstall = lastVersion === '0.0.0.0'; - var redirectUrl; - - var appendVersionInQuery = ""; - var onDataReceived = function(data) { entries = data.stats || {userId: µBlock.stats.generateUserId(),totalPings: 0 }; vAPI.storage.set({ 'stats': entries }); vAPI.tabs.open({ - url: redirectUrl+"?u=" + entries.userId + "&lg=" + navigator.language + appendVersionInQuery, + url: µBlock.donationUrl+"?u=" + entries.userId + "&lg=" + navigator.language, select: true, index: -1 }); } if(!firstInstall) { - if(µBlock.stats.browserFlavor == "E" && µBlock.stats.language == "en") { - var curVersion = chrome.runtime.getManifest().version; - if(lastVersion != curVersion) { - redirectUrl = µBlock.surveyUrl; - appendVersionInQuery = "&v=" + curVersion; - vAPI.storage.get('stats',onDataReceived); - } - } return; } - redirectUrl = µBlock.donationUrl; vAPI.storage.get('stats',onDataReceived); }; vAPI.storage.get('extensionLastVersion', onVersionRead);