Commit 928bc8ad authored by Brian Grinstead's avatar Brian Grinstead
Browse files

Bug 1540123 - Append menuitems into the menupopup for the certificate nickname... 

Bug 1540123 - Append menuitems into the menupopup for the certificate nickname menulist in certificate selection dialog UI r=keeler

Differential Revision: https://phabricator.services.mozilla.com/D25825

--HG--
extra : moz-landing-system : lando
parent 23cebd51

security/manager/pki/resources/content/choosetoken.js

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ function onLoad() { 
    let token = dialogParams.GetString(i);

    menuItemNode.setAttribute("value", token);

    menuItemNode.setAttribute("label", token);

    selectElement.firstChild.appendChild(menuItemNode);

    selectElement.menupopup.appendChild(menuItemNode);

    if (i == 0) {

      selectElement.selectedItem = menuItemNode;

    }

security/manager/pki/resources/content/clientauthask.js

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ function onLoad() { 
                                [cert.displayName, cert.serialNumber]);

    menuItemNode.setAttribute("value", i);

    menuItemNode.setAttribute("label", nickAndSerial); // This is displayed.

    selectElement.firstChild.appendChild(menuItemNode);

    selectElement.menupopup.appendChild(menuItemNode);

    if (i == 0) {

      selectElement.selectedItem = menuItemNode;

    }

security/manager/ssl/tests/mochitest/browser/browser_clientAuth_ui.js

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ function checkDialogContents(win, notBefore, notAfter) { 
               "Mochitest client [03]",

               "Actual and expected selected cert nickname and serial should " +

               "be equal");

  Assert.equal(win.document.getElementById("nicknames").itemCount, 1, "correct number of items");



  let [subject, serialNum, validity, issuer, tokenName] =

    win.document.getElementById("details").value.split("\n");