| Index: chrome/content/ui/firstRun.js | 
| =================================================================== | 
| --- a/chrome/content/ui/firstRun.js | 
| +++ b/chrome/content/ui/firstRun.js | 
| @@ -15,75 +15,342 @@ | 
| * along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | 
| */ | 
| -function init() | 
| +"use strict"; | 
| + | 
| +(function() | 
| { | 
| - generateLinkText(E("changeDescription")); | 
| + var shade; | 
| + var scrollTimer; | 
| - for each (let subscription in FilterStorage.subscriptions) | 
| + // Determine platform | 
| + var userAgent = ""; | 
| + if (navigator.userAgent.indexOf("Gecko/") > -1) | 
| + userAgent = "firefox"; | 
| + else if (navigator.userAgent.indexOf("Chrome/") > -1) | 
| + userAgent = "chrome"; | 
| + | 
| + if (userAgent !== "") | 
| + document.documentElement.className = userAgent; | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
Please never do user agent detection, use feature
 
Thomas Greiner
2013/05/27 13:03:16
I wanted to but the problem is that Firefox' utils
 
Wladimir Palant
2013/05/27 14:10:37
Feel free to replace let by var everywhere in util
 
Thomas Greiner
2013/05/27 16:39:15
Done.
 
 | 
| + | 
| + // Load subscriptions for features | 
| + var featureSubscriptions = {}; | 
| + (function() | 
| { | 
| - if (subscription instanceof DownloadableSubscription && subscription.url != Prefs.subscriptions_exceptionsurl && !subscription.disabled) | 
| + var request = new XMLHttpRequest(); | 
| + request.open("GET", "featureSubscriptions.xml", false); | 
| + request.send(); | 
| + var subscriptions = request.responseXML.getElementsByTagName("subscription"); | 
| + for (var i = 0, len = subscriptions.length; i < len; i++) | 
| { | 
| - E("listName").textContent = subscription.title; | 
| + var subscription = subscriptions[i]; | 
| + featureSubscriptions[subscription.getAttribute("feature")] = { | 
| + "url": subscription.getAttribute("url"), | 
| + "title": subscription.getAttribute("title") | 
| + }; | 
| + } | 
| + })(); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
How about hardcoding the value of featureSubscript
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| - let link = E("listHomepage"); | 
| - link.setAttribute("href", subscription.homepage); | 
| - link.setAttribute("title", subscription.homepage); | 
| + // Determine scripts to load | 
| + var scripts = []; | 
| + if (userAgent == "chrome") | 
| + { | 
| + var backgroundPage = chrome.extension.getBackgroundPage(); | 
| + var require = backgroundPage.require; | 
| + } | 
| + else if (userAgent == "firefox") | 
| + { | 
| + scripts.push("utils.js"); | 
| + } | 
| + scripts.push("i18n.js"); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
This shouldn't be necessary. As I said above, just
 
Thomas Greiner
2013/05/27 16:39:15
Done.
 
 | 
| - E("listNameContainer").removeAttribute("hidden"); | 
| - E("listNone").setAttribute("hidden", "true"); | 
| - break; | 
| + function loadScripts() | 
| + { | 
| + var scriptName = scripts.shift(); | 
| + var script = document.createElement("script"); | 
| + script.type = (userAgent == "firefox") ? "application/x-javascript;version=1.7" : "text/javascript"; | 
| + script.addEventListener("load", (scripts.length == 0) ? onScriptsLoaded : loadScripts, false); | 
| + script.src = scriptName; | 
| + document.head.appendChild(script); | 
| + } | 
| + | 
| + function onScriptsLoaded() | 
| + { | 
| + var isFirstRun = (userAgent == "chrome" && backgroundPage.isFirstRun) | 
| + || (userAgent == "firefox" && !UI.firstRunDone); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
I think we can safely drop the update scenario now
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + | 
| + if (userAgent == "chrome") | 
| + { | 
| + window.Synchronizer = require("synchronizer").Synchronizer; | 
| + window.Utils = require("utils").Utils; | 
| + window.Prefs = require("prefs").Prefs; | 
| + window.FilterStorage = require("filterStorage").FilterStorage; | 
| + window.FilterNotifier = require("filterNotifier").FilterNotifier; | 
| + | 
| + var subscriptionClasses = require("subscriptionClasses"); | 
| + window.Subscription = subscriptionClasses.Subscription; | 
| + window.DownloadableSubscription = subscriptionClasses.DownloadableSubscription; | 
| + window.Filter = require("filterClasses").Filter; | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
This should be in the Chrome variant of utils.js.
 
Thomas Greiner
2013/05/27 16:39:15
Done.
 
 | 
| + } | 
| + | 
| + // Set up page title | 
| + var titleId = isFirstRun ? "firstRun_title_install" : "firstRun_title_update"; | 
| + var pageTitle = i18n.getMessage(titleId); | 
| + document.title = document.getElementById("title-main").textContent = pageTitle; | 
| + | 
| + // Only show changelog link on the update page | 
| + if (isFirstRun) | 
| + document.getElementById("title-changelog").style.display = "none"; | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
See above, the update case is irrelevant by now an
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + | 
| + // Show warning if data corruption was detected | 
| + // TODO: check in Firefox | 
| 
 
Thomas Greiner
2013/05/24 10:19:12
ignore the TODO here :)
 
 | 
| + if (userAgent == "chrome" && backgroundPage.seenDataCorruption) | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
Please change that into (typeof backgroundPage !=
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + { | 
| + document.getElementById("dataCorruptionWarning").removeAttribute("hidden"); | 
| + setLinks("dataCorruptionWarning", getDocLink("knownIssuesChrome_filterstorage")); | 
| + } | 
| + | 
| + // Set up URLs | 
| + var versionId; | 
| + var platformId; | 
| + if (userAgent == "firefox") | 
| + { | 
| + versionId = Utils.addonVersion.match(/^[0-9\.]+/)[0].replace(/\./g, ""); | 
| + platformId = "firefox"; | 
| + } | 
| + else if (userAgent == "chrome") | 
| + { | 
| + versionId = chrome.app.getDetails().version.split(".").slice(0, 2).join(""); | 
| + platformId = "google-chrome"; | 
| + } | 
| + setLinks("title-changelog", "https://adblockplus.org/releases/adblock-plus-" + versionId + "-for-" + platformId + "-released"); | 
| + setLinks("acceptableAdsExplanation", getDocLink("acceptable_ads_criteria"), openFilters); | 
| + | 
| + shade = document.getElementById("shade"); | 
| + shade.addEventListener("mouseover", scrollPage, false); | 
| + shade.addEventListener("mouseout", stopScroll, false); | 
| + | 
| + // Set up typo feature | 
| + if (userAgent == "firefox") | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
Please don't assume that only Firefox has the typo
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + { | 
| + var typoSettings = document.createElement("script"); | 
| + typoSettings.type = "application/x-javascript;version=1.7"; | 
| + typoSettings.src = "typoSettings.js"; | 
| + document.head.appendChild(typoSettings); | 
| + | 
| + var toggleTypo = document.getElementById("toggle-typo"); | 
| + updateToggleButton("typo", Prefs.correctTypos); | 
| + Prefs.addListener(function(name) | 
| + { | 
| + if (name == "correctTypos") | 
| + updateToggleButton("typo", Prefs.correctTypos); | 
| + }); | 
| + toggleTypo.addEventListener("click", function(event) | 
| + { | 
| + TypoActions.setEnabled(!Prefs.correctTypos); | 
| + }, false); | 
| + } | 
| + | 
| + // Set up feature buttons linked to subscriptions | 
| + setToggleSubscriptionButton("malware"); | 
| + setToggleSubscriptionButton("social"); | 
| + setToggleSubscriptionButton("tracking"); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
How about:
featureSubscriptions.forEach(setToggle
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + | 
| + window.addEventListener("resize", onWindowResize, false); | 
| + document.addEventListener("scroll", onScroll, false); | 
| + | 
| + onWindowResize(); | 
| + | 
| + initSocialLinks(null); | 
| + } | 
| + | 
| + function onScroll() | 
| + { | 
| + var currentHeight = document.documentElement.scrollTop + document.body.scrollTop + document.documentElement.clientHeight; | 
| + shade.style.opacity = (document.documentElement.scrollHeight == currentHeight) ? "0.0" : "0.5"; | 
| + } | 
| + | 
| + function onWindowResize() | 
| + { | 
| + onScroll(); | 
| + } | 
| + | 
| + function getSubscription(featureSubscription) | 
| + { | 
| + var subscriptions = FilterStorage.subscriptions; | 
| + for (var i = 0, len = subscriptions.length; i < len; i++) | 
| + { | 
| + var subscription = subscriptions[i]; | 
| + if (subscription.url == featureSubscription.url && subscription instanceof DownloadableSubscription) | 
| + return subscription; | 
| + } | 
| + | 
| + return null; | 
| + } | 
| + | 
| + function isSubscriptionEnabled(featureSubscription) | 
| + { | 
| + var subscription = getSubscription(featureSubscription); | 
| + return subscription != null && !subscription.disabled; | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
FilterStorage keeps a lookup table for listed subs
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + } | 
| + | 
| + function setToggleSubscriptionButton(feature) | 
| + { | 
| + var featureSubscription = featureSubscriptions[feature]; | 
| + | 
| + var element = document.getElementById("toggle-" + feature); | 
| + updateToggleButton(feature, isSubscriptionEnabled(featureSubscription)); | 
| + FilterNotifier.addListener(function(action) | 
| + { | 
| + if (/^(filter|subscription)\.(added|removed|disabled)$/.test(action)) | 
| + updateToggleButton(feature, isSubscriptionEnabled(featureSubscription)); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
How about adding a single listener that will updat
 
Thomas Greiner
2013/05/27 13:03:16
Not removing the listeners was a clear oversight,
 
Thomas Greiner
2013/05/27 16:39:15
Readded with unload.
 
 | 
| + }); | 
| + element.addEventListener("click", function(event) | 
| + { | 
| + var subscription = getSubscription(featureSubscription); | 
| + if (subscription == null) | 
| + { | 
| + subscription = Subscription.fromURL(featureSubscription.url); | 
| + subscription.disabled = false; | 
| + subscription.title = featureSubscription.title; | 
| + subscription.homepage = featureSubscription.homepage; | 
| + FilterStorage.addSubscription(subscription); | 
| + if (subscription instanceof DownloadableSubscription && !subscription.lastDownload) | 
| + Synchronizer.execute(subscription); | 
| + } | 
| + else if (!subscription.disabled) | 
| + FilterStorage.removeSubscription(subscription); | 
| + else | 
| + subscription.disabled = false; | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
The logic should be simpler here, either it's curr
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| + }, false); | 
| + } | 
| + | 
| + function scrollPage() | 
| + { | 
| + if (scrollTimer) | 
| + stopScroll(); | 
| + | 
| + scrollTimer = setInterval(function() | 
| + { | 
| + window.scrollBy(0, 5); | 
| + }, 20); | 
| + } | 
| + | 
| + function stopScroll() | 
| + { | 
| + clearTimeout(scrollTimer); | 
| + scrollTimer = null; | 
| + } | 
| + | 
| + function openSharePopup(url) | 
| + { | 
| + var iframe = document.getElementById("share-popup"); | 
| + var glassPane = document.getElementById("glass-pane"); | 
| + var popupMessageReceived = false; | 
| + | 
| + var popupMessageListener = function(event) | 
| + { | 
| + var originFilter = Filter.fromText("||adblockplus.org^"); | 
| + if (!originFilter.matches(event.origin, "OTHER", null, null)) | 
| + 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"; | 
| + popupMessageReceived = true; | 
| + window.removeEventListener("message", popupMessageListener); | 
| + }; | 
| + // Firefox requires last parameter to be true to be triggered by unprivileged pages | 
| + window.addEventListener("message", popupMessageListener, false, true); | 
| + | 
| + var popupLoadListener = function() | 
| + { | 
| + if (popupMessageReceived) | 
| + { | 
| + iframe.className = "visible"; | 
| + | 
| + var popupCloseListener = function() | 
| + { | 
| + iframe.className = glassPane.className = ""; | 
| + document.removeEventListener("click", popupCloseListener); | 
| + }; | 
| + document.addEventListener("click", popupCloseListener, false); | 
| + } | 
| + else | 
| + { | 
| + glassPane.className = ""; | 
| + window.removeEventListener("message", popupMessageListener); | 
| + } | 
| + | 
| + iframe.removeEventListener("load", popupLoadListener); | 
| + }; | 
| + iframe.addEventListener("load", popupLoadListener, false); | 
| + | 
| + iframe.src = url; | 
| + glassPane.className = "visible"; | 
| + } | 
| + | 
| + function initSocialLinks(variant) | 
| + { | 
| + var networks = ["twitter", "facebook", "gplus"]; | 
| + networks.forEach(function(network) | 
| + { | 
| + var link = document.getElementById("share-" + network); | 
| + link.addEventListener("click", function(e) | 
| + { | 
| + e.preventDefault(); | 
| + openSharePopup(getDocLink("share-" + network) + "&variant=" + variant); | 
| + }, false); | 
| + }); | 
| + } | 
| + | 
| + function setLinks(id) | 
| + { | 
| + var element = document.getElementById(id); | 
| + if (!element) | 
| + return; | 
| + | 
| + var links = element.getElementsByTagName("a"); | 
| + for (var i = 0; i < links.length; i++) | 
| + { | 
| + if (typeof arguments[i + 1] == "string") | 
| + { | 
| + links[i].href = arguments[i + 1]; | 
| + links[i].setAttribute("target", "_blank"); | 
| + } | 
| + else if (typeof arguments[i + 1] == "function") | 
| + { | 
| + links[i].href = "javascript:void(0);"; | 
| + links[i].addEventListener("click", arguments[i + 1], false); | 
| + } | 
| } | 
| } | 
| - if (FilterStorage.subscriptions.some(function(s) s.url == Prefs.subscriptions_exceptionsurl)) | 
| - E("acceptableAds").removeAttribute("hidden"); | 
| -} | 
| + function getDocLink(page, anchor) | 
| + { | 
| + return Prefs.documentation_link | 
| + .replace(/%LINK%/g, page) | 
| + .replace(/%LANG%/g, Utils.appLocale) + (anchor ? "#" + anchor : ""); | 
| + } | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
The anchor parameter is unnecessary.
This is dupl
 
 | 
| -function generateLinkText(element) | 
| -{ | 
| - let template = element.getAttribute("_textTemplate"); | 
| - | 
| - let [, beforeLink, linkText, afterLink] = /(.*)\[link\](.*)\[\/link\](.*)/.exec(template) || [null, "", template, ""]; | 
| - while (element.firstChild && element.firstChild.nodeType != Node.ELEMENT_NODE) | 
| - element.removeChild(element.firstChild); | 
| - while (element.lastChild && element.lastChild.nodeType != Node.ELEMENT_NODE) | 
| - element.removeChild(element.lastChild); | 
| - if (!element.firstChild) | 
| - return; | 
| - | 
| - element.firstChild.textContent = linkText; | 
| - element.insertBefore(document.createTextNode(beforeLink), element.firstChild); | 
| - element.appendChild(document.createTextNode(afterLink)); | 
| -} | 
| - | 
| -function openFilters() | 
| -{ | 
| - if (Utils.isFennec) | 
| + function openFilters() | 
| { | 
| - let topWnd = window.QueryInterface(Ci.nsIInterfaceRequestor) | 
| - .getInterface(Ci.nsIWebNavigation) | 
| - .QueryInterface(Ci.nsIDocShellTreeItem) | 
| - .rootTreeItem | 
| - .QueryInterface(Ci.nsIInterfaceRequestor) | 
| - .getInterface(Ci.nsIDOMWindow); | 
| - if (topWnd.wrappedJSObject) | 
| - topWnd = topWnd.wrappedJSObject; | 
| - | 
| - // window.close() closes the entire window (bug 642604), make sure to close | 
| - // only a single tab instead. | 
| - if ("BrowserUI" in topWnd) | 
| + if (userAgent == "firefox") | 
| + UI.openFiltersDialog(); | 
| + else if (userAgent == "chrome") | 
| { | 
| - topWnd.BrowserUI.showPanel("addons-container"); | 
| - function showOptions() | 
| - { | 
| - if (!topWnd.ExtensionsView.getElementForAddon(Utils.addonID)) | 
| - Utils.runAsync(showOptions); | 
| - else | 
| - topWnd.ExtensionsView.showOptions(Utils.addonID); | 
| - } | 
| - showOptions(); | 
| + backgroundPage.openOptions(); | 
| 
 
Wladimir Palant
2013/05/27 11:02:00
Again, please don't go by user agents here:
if (t
 
Thomas Greiner
2013/05/27 13:03:16
Done.
 
 | 
| } | 
| } | 
| - else | 
| - UI.openFiltersDialog(); | 
| -} | 
| + | 
| + function updateToggleButton(feature, isEnabled) | 
| + { | 
| + var button = document.getElementById("toggle-" + feature); | 
| + button.className = isEnabled ? "disable" : "enable"; | 
| + button.textContent = i18n.getMessage(isEnabled ? "firstRun_action_disable" : "firstRun_action_enable"); | 
| + } | 
| + | 
| + document.addEventListener("DOMContentLoaded", loadScripts, false); | 
| +})(); |