Commit 2ce971c7 authored by henry's avatar henry Committed by Richard Pospesel
Browse files

fixup! Bug 40926: Implemented the New Identity feature 

Bug 42211: Migrate to Fluent.
parent 96ab6401

browser/base/content/appmenu-viewcache.inc.xhtml

+1 −0
Changes for browser/base/content/appmenu-viewcache.inc.xhtml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
      <toolbarseparator/>

      <toolbarbutton id="appMenu-new-identity"

                     class="subviewbutton"

                     data-l10n-id="appmenuitem-new-identity"

                     key="new-identity-key"/>

      <toolbarseparator/>

      <toolbarbutton id="appMenu-bookmarks-button"

browser/base/content/browser-menubar.inc

+1 −1
Changes for browser/base/content/browser-menubar.inc: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
                          key="key_privatebrowsing" data-l10n-id="menu-file-new-private-window"/>

                <menuseparator/>

                <menuitem id="menu_newIdentity"

                          key="new-identity-key"/>

                          key="new-identity-key" data-l10n-id="menu-new-identity"/>

                <menuseparator/>

                <menuitem id="menu_openLocation"

                          hidden="true"

browser/base/content/navigator-toolbox.inc.xhtml

+2 −1
Changes for browser/base/content/navigator-toolbox.inc.xhtml: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -590,7 +590,8 @@ 
                   ondragover="newWindowButtonObserver.onDragOver(event)"

                   ondragenter="newWindowButtonObserver.onDragOver(event)"/>



    <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional"/>

    <toolbarbutton id="new-identity-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   data-l10n-id="toolbar-new-identity"/>



    <toolbarbutton id="fullscreen-button" class="toolbarbutton-1 chromeclass-toolbar-additional"

                   observes="View:FullScreen"

browser/components/newidentity/content/newIdentityDialog.js

+3 −10
Changes for browser/components/newidentity/content/newIdentityDialog.js: 3 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -5,20 +5,13 @@ 
document.addEventListener("dialogaccept", () => {

  const retvals = window.arguments[0];

  retvals.confirmed = true;

  retvals.neverAskAgain = document.querySelector("#neverAskAgain").checked;

  retvals.neverAskAgain = document.getElementById("neverAskAgain").checked;

});



document.addEventListener("DOMContentLoaded", () => {

  const { NewIdentityStrings } = window.arguments[0];

  const dialog = document.querySelector("#newIdentityDialog");

  const dialog = document.getElementById("newIdentityDialog");



  dialog.querySelector("#infoTitle").textContent =

    NewIdentityStrings.new_identity_prompt_title;

  dialog.querySelector("#infoBody").textContent =

    NewIdentityStrings.new_identity_prompt;

  dialog.querySelector("#neverAskAgain").label =

    NewIdentityStrings.new_identity_ask_again;

  const accept = dialog.getButton("accept");

  accept.label = NewIdentityStrings.new_identity_restart;

  document.l10n.setAttributes(accept, "new-identity-dialog-confirm");

  accept.classList.add("danger-button");

});

browser/components/newidentity/content/newIdentityDialog.xhtml

+10 −6
Changes for browser/components/newidentity/content/newIdentityDialog.xhtml: 10 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -21,9 +21,8 @@ 
>

  <dialog id="newIdentityDialog" buttons="accept,cancel" defaultButton="accept">

    <linkset>

      <!-- Without this document.l10n is not initialized, and we need it for the

    cancel button. -->

      <html:link rel="localization" href="branding/brand.ftl" />

      <html:link rel="localization" href="browser/base-browser.ftl" />

    </linkset>



    <div xmlns="http://www.w3.org/1999/xhtml">
@@ -33,13 +32,18 @@ 
            <xul:image id="infoIcon" />

          </div>

          <div id="infoContainer">

            <xul:description id="infoTitle" />

            <xul:description

              id="infoTitle"

              data-l10n-id="new-identity-dialog-title"

            />

            <xul:description

              id="infoBody"

              context="contentAreaContextMenu"

              noinitialfocus="true"

              data-l10n-id="new-identity-dialog-description"

            />

            <xul:checkbox

              id="neverAskAgain"

              data-l10n-id="new-identity-dialog-never-ask-checkbox"

            />

            <xul:checkbox id="neverAskAgain" />

          </div>

        </div>

      </div>