Commit 1777bccf authored by Noemi Erli's avatar Noemi Erli
Browse files

Merge autoland to mozilla-central. a=merge

parents 350e4090 aa38e7e1

.eslintignore

+2 −2
Original line number Diff line number Diff line
@@ -37,8 +37,8 @@ browser/components/sessionstore/test/unit/data/sessionstore_valid.js 
browser/components/sessionstore/test/unit/data/sessionstore_invalid.js

# This file is split into two in order to keep it as a valid json file

# for documentation purposes (policies.json) but to be accessed by the

# code as a .jsm (schema.jsm)

browser/components/enterprisepolicies/schemas/schema.jsm

# code as a .sys.mjs (schema.sys.mjs)

browser/components/enterprisepolicies/schemas/schema.sys.mjs

# generated or library files in pocket

browser/components/pocket/content/panels/js/tmpl.js

browser/components/pocket/content/panels/js/vendor.bundle.js

.prettierignore

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ browser/components/sessionstore/test/unit/data/sessionstore_valid.js 
browser/components/sessionstore/test/unit/data/sessionstore_invalid.js

# This file is split into two in order to keep it as a valid json file

# for documentation purposes (policies.json) but to be accessed by the

# code as a .jsm (schema.jsm)

browser/components/enterprisepolicies/schemas/schema.jsm

# code as a .sys.mjs (schema.sys.mjs)

browser/components/enterprisepolicies/schemas/schema.sys.mjs

# generated or library files in pocket

browser/components/pocket/content/panels/js/tmpl.js

browser/components/pocket/content/panels/js/vendor.bundle.js

browser/actors/SearchSERPTelemetryChild.sys.mjs

+10 −0
Original line number Diff line number Diff line
@@ -370,6 +370,16 @@ class SearchAdImpression { 
    if (href?.startsWith("/")) {

      href = this.#pageUrl.origin + href;

    }

    // Some reserved characters are converted into percent-encoded strings by

    // the time they are observed in the network.

    // e.g. /path'?q=Mozilla's -> /path'?q=Mozilla%27s

    if (href) {

      try {

        href = Services.io.newURI(href)?.spec;

      } catch {

        return "";

      }

    }

    return href;

  }

browser/components/enterprisepolicies/content/aboutPolicies.js

+2 −2
Original line number Diff line number Diff line
@@ -8,8 +8,8 @@ const { XPCOMUtils } = ChromeUtils.importESModule( 
  "resource://gre/modules/XPCOMUtils.sys.mjs"

);



XPCOMUtils.defineLazyModuleGetters(this, {

  schema: "resource:///modules/policies/schema.jsm",

ChromeUtils.defineESModuleGetters(this, {

  schema: "resource:///modules/policies/schema.sys.mjs",

});



function col(text, className) {

browser/components/enterprisepolicies/schemas/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ with Files("**"): 
    BUG_COMPONENT = ("Firefox", "Enterprise Policies")



EXTRA_PP_JS_MODULES.policies += [

    "schema.jsm",

    "schema.sys.mjs",

]