Commit 98926c46 authored by Coroiu Cristina's avatar Coroiu Cristina
Browse files

Merge inbound to mozilla-central a=merge

parents 7dce60ec 05555ab9

browser/components/aboutconfig/content/aboutconfig.html

+6 −4
Original line number Diff line number Diff line
@@ -18,14 +18,16 @@ 
    <title data-l10n-id="about-config-title"></title>

  </head>

  <body>

    <div class="container">

    <div class="container" role="alertdialog" aria-labelledby="warningTitle"

         aria-describedby="warningDescription">



      <div class="title">

        <h1 class="title-text" data-l10n-id="about-config-warning-title"></h1>

        <h1 id="warningTitle" class="title-text"

            data-l10n-id="about-config-warning-title"></h1>

      </div>



      <div class="description">

        <p data-l10n-id="about-config-warning-text"></p>

        <p id="warningDescription" data-l10n-id="about-config-warning-text"></p>

      </div>



      <div class="toggle-container-with-text">
@@ -35,7 +37,7 @@ 
      </div>



      <div class="button-container">

        <button class="primary" onclick="onWarningButtonClick();"

        <button autofocus class="primary" onclick="onWarningButtonClick();"

                data-l10n-id="about-config-warning-button"></button>

      </div>

    </div>

browser/components/aboutconfig/content/aboutconfig.js

+7 −1
Original line number Diff line number Diff line
@@ -14,6 +14,12 @@ const GETTERS_BY_PREF_TYPE = { 
  [Ci.nsIPrefBranch.PREF_STRING]: "getStringPref",

};



const STRINGS_ADD_BY_TYPE = {

  Boolean: "about-config-pref-add-type-boolean",

  Number: "about-config-pref-add-type-number",

  String: "about-config-pref-add-type-string",

};



let gDefaultBranch = Services.prefs.getDefaultBranch("");

let gFilterPrefsTask = new DeferredTask(() => filterPrefs(), SEARCH_TIMEOUT_MS);
@@ -207,7 +213,7 @@ class PrefRow { 
          radio.checked = this.type == type;

          form.appendChild(radio);

          let radioLabel = document.createElement("span");

          radioLabel.textContent = type;

          document.l10n.setAttributes(radioLabel, STRINGS_ADD_BY_TYPE[type]);

          form.appendChild(radioLabel);

        }

        form.addEventListener("click", event => {

browser/locales/en-US/browser/aboutConfig.ftl

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,11 @@ about-config-pref-save = Save 
about-config-pref-reset = Reset

about-config-pref-delete = Delete



## Labels for the type selection radio buttons shown when adding preferences.

about-config-pref-add-type-boolean = Boolean

about-config-pref-add-type-number = Number

about-config-pref-add-type-string = String



## Preferences with a non-default value are differentiated visually, and at the

## same time the state is made accessible to screen readers using an aria-label

## that won't be visible or copied to the clipboard.

devtools/client/shared/test/unit/test_escapeCSSComment.js

+2 −2
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
"use strict";



const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");

const {escapeCSSComment, _unescapeCSSComment} = require("devtools/shared/css/parsing-utils");

const {escapeCSSComment, unescapeCSSComment} = require("devtools/shared/css/parsing-utils");



const TEST_DATA = [

  {
@@ -33,7 +33,7 @@ function run_test() { 


    const escaped = escapeCSSComment(test.input);

    equal(escaped, test.expected);

    const unescaped = _unescapeCSSComment(escaped);

    const unescaped = unescapeCSSComment(escaped);

    equal(unescaped, test.input);

  }

}

devtools/client/shared/test/unit/test_rewriteDeclarations.js

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
"use strict";



const {require} = ChromeUtils.import("resource://devtools/shared/Loader.jsm");

const {RuleRewriter} = require("devtools/shared/css/parsing-utils");

const RuleRewriter = require("devtools/shared/fronts/inspector/rule-rewriter");

const {isCssPropertyKnown} = require("devtools/server/actors/css-properties");



const TEST_DATA = [