Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Unified Diff: firstRun.js

Issue 6180766664884224: Issue 1663 - Made first-run page use an asynchronous messaging protocol (Closed)
Patch Set: Adressed comments Created Dec. 18, 2014, 7:30 p.m.
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ext/content.js ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: firstRun.js
===================================================================
--- a/firstRun.js
+++ b/firstRun.js
@@ -36,115 +36,118 @@
{
feature: "tracking",
homepage: "https://easylist.adblockplus.org/",
title: "EasyPrivacy",
url: "https://easylist-downloads.adblockplus.org/easyprivacy.txt"
}
];
+ function getDocLink(link, callback)
+ {
+ ext.backgroundPage.sendMessage({
+ type: "app.get",
+ what: "doclink",
+ link: link
+ }, callback);
+ }
+
function onDOMLoaded()
{
// Set up URLs
- var donateLink = E("donate");
- donateLink.href = Utils.getDocLink("donate");
+ getDocLink("donate", function(link)
+ {
+ E("donate").href = link;
+ });
- var contributors = E("contributors");
- contributors.href = Utils.getDocLink("contributors");
+ getDocLink("contributors", function(link)
+ {
+ E("contributors").href = link;
+ });
- setLinks("acceptableAdsExplanation", Utils.getDocLink("acceptable_ads_criteria"), openFilters);
- setLinks("share-headline", Utils.getDocLink("contribute"));
+ getDocLink("acceptable_ads_criteria", function(link)
+ {
+ setLinks("acceptableAdsExplanation", link, openFilters);
+ });
- if (typeof backgroundPage != "undefined")
+ getDocLink("contribute", function(link)
+ {
+ setLinks("share-headline", link);
+ });
+
+ ext.backgroundPage.sendMessage({
+ type: "app.get",
+ what: "issues"
+ }, function(issues)
{
// Show warning if data corruption was detected
- if (backgroundPage.seenDataCorruption)
+ if (issues.seenDataCorruption)
{
E("dataCorruptionWarning").removeAttribute("hidden");
- setLinks("dataCorruptionWarning", Utils.getDocLink("knownIssuesChrome_filterstorage"));
+ getDocLink("knownIssuesChrome_filterstorage", function(link)
+ {
+ setLinks("dataCorruptionWarning", link);
+ });
}
// Show warning if filterlists settings were reinitialized
- if (backgroundPage.filterlistsReinitialized)
+ if (issues.filterlistsReinitialized)
{
E("filterlistsReinitializedWarning").removeAttribute("hidden");
setLinks("filterlistsReinitializedWarning", openFilters);
}
- }
- // Show warning if Safari version isn't supported
- var info = require("info");
- if (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
- Services.vc.compare(info.platformVersion, "7.0") == 0
- ))
- E("legacySafariWarning").removeAttribute("hidden");
+ if (issues.legacySafariVersion)
+ E("legacySafariWarning").removeAttribute("hidden");
+ });
// Set up feature buttons linked to subscriptions
- featureSubscriptions.forEach(setToggleSubscriptionButton);
- var filterListener = function(action)
+ featureSubscriptions.forEach(initToggleSubscriptionButton);
+ updateToggleButtons();
+ updateSocialLinks();
+
+ ext.onMessage.addListener(function(message)
{
- if (/^subscription\.(added|removed|disabled)$/.test(action))
+ if (message.type == "subscriptions.listen")
{
- for (var i = 0; i < featureSubscriptions.length; i++)
- {
- var featureSubscription = featureSubscriptions[i];
- updateToggleButton(featureSubscription.feature, isSubscriptionEnabled(featureSubscription));
- }
+ updateToggleButtons();
+ updateSocialLinks();
}
- }
- FilterNotifier.addListener(filterListener);
- window.addEventListener("unload", function(event)
- {
- FilterNotifier.removeListener(filterListener);
- }, false);
-
- initSocialLinks();
+ });
+ ext.backgroundPage.sendMessage({
+ type: "subscriptions.listen",
+ filter: ["added", "removed", "disabled"]
+ });
}
- function isSubscriptionEnabled(featureSubscription)
- {
- return featureSubscription.url in FilterStorage.knownSubscriptions
- && !Subscription.fromURL(featureSubscription.url).disabled;
- }
-
- function setToggleSubscriptionButton(featureSubscription)
+ function initToggleSubscriptionButton(featureSubscription)
{
var feature = featureSubscription.feature;
var element = E("toggle-" + feature);
- updateToggleButton(feature, isSubscriptionEnabled(featureSubscription));
element.addEventListener("click", function(event)
{
- var subscription = Subscription.fromURL(featureSubscription.url);
- if (isSubscriptionEnabled(featureSubscription))
- FilterStorage.removeSubscription(subscription);
- else
- {
- subscription.disabled = false;
- subscription.title = featureSubscription.title;
- subscription.homepage = featureSubscription.homepage;
- FilterStorage.addSubscription(subscription);
- if (!subscription.lastDownload)
- Synchronizer.execute(subscription);
- }
+ ext.backgroundPage.sendMessage({
+ type: "subscriptions.toggle",
+ url: featureSubscription.url,
+ title: featureSubscription.title,
+ homepage: featureSubscription.homepage
+ });
}, false);
}
function openSharePopup(url)
{
var iframe = E("share-popup");
var glassPane = E("glass-pane");
var popupMessageReceived = false;
var popupMessageListener = function(event)
{
- var originFilter = Filter.fromText("||adblockplus.org^");
- if (!originFilter.matches(event.origin, "OTHER", null, null))
+ if (!/[.\/]adblockplus\.org$/.test(event.origin))
return;
var width = event.data.width;
var height = event.data.height;
iframe.width = width;
iframe.height = height;
iframe.style.marginTop = -height/2 + "px";
iframe.style.marginLeft = -width/2 + "px";
@@ -176,35 +179,48 @@
iframe.removeEventListener("load", popupLoadListener);
};
iframe.addEventListener("load", popupLoadListener, false);
iframe.src = url;
glassPane.className = "visible";
}
- function initSocialLinks()
+ function updateSocialLinks()
{
var networks = ["twitter", "facebook", "gplus"];
networks.forEach(function(network)
{
var link = E("share-" + network);
- link.addEventListener("click", onSocialLinkClick, false);
+ var message = {
+ type: "filters.blocked",
+ url: link.getAttribute("data-script"),
+ requestType: "SCRIPT",
+ docDomain: "adblockplus.org",
+ thirdParty: true
+ };
+ ext.backgroundPage.sendMessage(message, function(blocked)
+ {
+ // Don't open the share page if the sharing script would be blocked
+ if (blocked)
+ link.removeEventListener("click", onSocialLinkClick, false);
+ else
+ link.addEventListener("click", onSocialLinkClick, false);
+ });
});
}
function onSocialLinkClick(event)
{
- // Don't open the share page if the sharing script would be blocked
- var filter = defaultMatcher.matchesAny(event.target.getAttribute("data-script"), "SCRIPT", "adblockplus.org", true);
- if (!(filter instanceof BlockingFilter))
+ event.preventDefault();
+
+ getDocLink(event.target.id, function(link)
{
- event.preventDefault();
- openSharePopup(Utils.getDocLink(event.target.id));
- }
+ openSharePopup(link);
+ });
}
function setLinks(id)
{
var element = E(id);
if (!element)
{
return;
@@ -224,22 +240,33 @@
links[i].href = "javascript:void(0);";
links[i].addEventListener("click", arguments[i + 1], false);
}
}
}
function openFilters()
{
- if (typeof UI != "undefined")
- UI.openFiltersDialog();
- else
+ ext.backgroundPage.sendMessage({type: "app.open", what: "options"});
+ }
+
+ function updateToggleButtons()
+ {
+ ext.backgroundPage.sendMessage({
+ type: "subscriptions.get",
+ downloadable: true,
+ ignoreDisabled: true
+ }, function(subscriptions)
{
- backgroundPage.openOptions();
- }
+ for (var i = 0; i < featureSubscriptions.length; i++)
+ {
+ var featureSubscription = featureSubscriptions[i];
+ updateToggleButton(featureSubscription.feature, subscriptions.indexOf(featureSubscription.url) >= 0);
+ }
+ });
}
function updateToggleButton(feature, isEnabled)
{
var button = E("toggle-" + feature);
if (isEnabled)
button.classList.remove("off");
else
« no previous file with comments | « ext/content.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld