Add acceptable ads message in FRP

html/static/js/firstRun.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2014 Eyeo GmbH
  *
  * Adblock Plus is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3 as
  * published by the Free Software Foundation.
  *
  * Adblock Plus is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 118 matching lines @@
   document.documentElement.className = classList.join(" ");
 
   initTranslations();
   initSocialLinks(variant);
   setLinks("aa-text", getDocLink("acceptable_ads_criteria"), "index.html");
 
   var donateLink = document.getElementById("share-donate");
   donateLink.href = getDocLink("donate") + "&variant=" + variant;
 }
 
-// Inserts i18n strings into matching elements. Any inner HTML already in the element is

[Felix Dahlke, 2014/07/24 09:04:49]

Should wrap at 80 columns.

-// parsed as JSON and used as parameters to substitute into placeholders in the i18n
-// message.
+// Inserts i18n strings into matching elements. Any inner HTML already in the 
+// element is parsed as JSON and used as parameters to substitute into 
+// placeholders in the i18n message.
 setElementText = function(element, elementHtml)
 {
   function processString(str, element)
   {
     var match = /^(.*?)<(a|strong)>(.*?)<\/\2>(.*)$/.exec(str);
     if (match)
     {
       processString(match[1], element);
 
       var e = document.createElement(match[2]);
@@ skipping 15 matching lines @@
 function setLinks(id)
 {
   var element = document.getElementById(id);
   if (!element)
   {
     return;
   }
 
   var links = element.getElementsByTagName("a");
 
-  for (var i = 0; i < links.length; i++)
+  for (var i = 0; i < links.length && i < arguments.length - 1; i++)
   {
-    if (i >= (arguments.length - 1))

[Felix Dahlke, 2014/07/24 09:04:49]

Why not add it to the for condition? Cleaner that way IMO.

for (var i = 0; i < links.length && i < arguments.length - 1; i++)

-      return;
     var curArg = arguments[i + 1];
     if (typeof curArg == "string")
     {
       links[i].href = curArg;
       links[i].setAttribute("target", "_blank");
     }
     else if (typeof curArg == "function")
     {
       links[i].href = "javascript:void(0);";
       links[i].addEventListener("click", curArg, false);
     }
   }
 }
 
 window.addEventListener("load", init);