Merge labels and access keys into one string in locales

chrome/content/ui/sendReport.js

 /*
  * This file is part of Adblock Plus <http://adblockplus.org/>,
  * Copyright (C) 2006-2013 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 800 matching lines @@
           if (requests[i].filter && !requests[i].filter.subscriptions.filter(function(s) !s.disabled).length)
             filtersRemoved = true;
 
         if (filtersRemoved)
         {
           // Force the user to reload the page
           E("updateFixedIssue").hidden = false;
           document.documentElement.canAdvance = true;
 
           let nextButton = document.documentElement.getButton("next");
-          nextButton.label = E("updatePage").getAttribute("reloadButtonLabel");
-          nextButton.accessKey = E("updatePage").getAttribute("reloadButtonAccesskey");
+          [nextButton.label, nextButton.accessKey] = Utils.splitLabel(E("updatePage").getAttribute("reloadButtonLabel"));
           document.documentElement.addEventListener("wizardnext", function(event)
           {
             event.preventDefault();
             event.stopPropagation();
             window.close();
             this.contentWnd.location.reload();
           }.bind(this), true);
         }
         else
         {
@@ skipping 230 matching lines @@
   {
     // User changed configuration, don't allow sending report now - page needs
     // to be reloaded
     E("issuesOverride").hidden = true;
     E("issuesChangeMessage").hidden = false;
     document.documentElement.canRewind = false;
     document.documentElement.canAdvance = true;
 
     let contentWnd = this.contentWnd;
     let nextButton = document.documentElement.getButton("next");
-    nextButton.label = E("issuesPage").getAttribute("reloadButtonLabel");
-    nextButton.accessKey = E("issuesPage").getAttribute("reloadButtonAccesskey");
+    [nextButton.label, nextButton.accessKey] = Utils.splitLabel(E("updatePage").getAttribute("reloadButtonLabel"));
     document.documentElement.addEventListener("wizardnext", function(event)
     {
       event.preventDefault();
       event.stopPropagation();
       window.close();
       contentWnd.location.reload();
     }, true);
   },
 
   removeWhitelist: function()
@@ skipping 113 matching lines @@
 function updateNextButton()
 {
   let nextButton = document.documentElement.getButton("next");
   if (!nextButton)
     return;
 
   if (document.documentElement.currentPage.id == "commentPage")
   {
     if (!nextButton.hasAttribute("_origLabel"))
     {
-      nextButton.setAttribute("_origLabel", nextButton.getAttribute("label"));
-      nextButton.setAttribute("label", document.documentElement.getAttribute("sendbuttonlabel"));
-      nextButton.setAttribute("_origAccessKey", nextButton.getAttribute("accesskey"));
-      nextButton.setAttribute("accesskey", document.documentElement.getAttribute("sendbuttonaccesskey"));
+      nextButton._origLabel = nextButton.label;
+      nextButton._origAccessKey = nextButton.accessKey;
+      [nextButton.label, nextButton.accessKey] = Utils.splitLabel(document.documentElement.getAttribute("sendbuttonlabel"));
     }
   }
   else
   {
     if (nextButton.hasAttribute("_origLabel"))
     {
-      nextButton.setAttribute("label", nextButton.getAttribute("_origLabel"));
-      nextButton.removeAttribute("_origLabel");
-      nextButton.setAttribute("accesskey", nextButton.getAttribute("_origAccessKey"));
-      nextButton.removeAttribute("_origAccessKey");
+      nextButton.label = nextButton._origLabel;
+      nextButton.accessKey = nextButton._origAccessKey;
+      delete nextButton._origLabel;

[Felix Dahlke, 2013/07/03 15:20:47]

Seems like an unrelated change, what's wrong with removeAttribute?

[Wladimir Palant, 2013/07/09 12:10:59]

Yes, this is somewhat unrelated. However, using an HTML attribute when all we
need is an expando property is an overkill.

I originally forgot to adapt the hasAttribute() check, this has been fixed now.

+      delete nextButton._origAccessKey;
     }
   }
 }
 
 function initDataCollectorPage()
 {
   document.documentElement.canAdvance = false;
 
   let totalSteps = dataCollectors.length;
   let initNextDataSource = function()
@@ skipping 331 matching lines @@
 
 function censorURL(url)
 {
   return url.replace(/([?;&\/#][^?;&\/#]+?=)[^?;&\/#]+/g, "$1*");
 }
 
 function encodeHTML(str)
 {
   return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;");
 }