Commit 5141530f authored by Wes Kocher's avatar Wes Kocher
Browse files

Merge m-c to inbound, a=merge 

MozReview-Commit-ID: EiG9icZCZ3x
parents 1e741430 3c05a499

accessible/tests/browser/.eslintrc.js

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ module.exports = { 
    "no-console": "off",

    "no-constant-condition": "off",

    "no-continue": "off",

    "no-control-regex": "error",

    "no-div-regex": "off",

    "no-extend-native": "error",

    "no-extra-parens": "off",

browser/base/content/browser.js

+1 −1
Original line number Diff line number Diff line
@@ -4085,7 +4085,7 @@ function addToUrlbarHistory(aUrlToAdd) { 
  if (!PrivateBrowsingUtils.isWindowPrivate(window) &&

      aUrlToAdd &&

      !aUrlToAdd.includes(" ") &&

      !/[\x00-\x1F]/.test(aUrlToAdd))

      !/[\x00-\x1F]/.test(aUrlToAdd)) // eslint-disable-line no-control-regex

    PlacesUIUtils.markPageAsTyped(aUrlToAdd);

}

browser/components/migration/.eslintrc.js

+0 −1
Original line number Diff line number Diff line
@@ -14,7 +14,6 @@ module.exports = { 
    "indent": ["error", 2, {"SwitchCase": 1, "ArrayExpression": "first", "ObjectExpression": "first"}],

    "max-nested-callbacks": ["error", 3],

    "new-parens": "error",

    "no-control-regex": "error",

    "no-extend-native": "error",

    "no-fallthrough": ["error", { "commentPattern": ".*[Ii]ntentional(?:ly)?\\s+fall(?:ing)?[\\s-]*through.*" }],

    "no-multi-str": "error",

browser/extensions/formautofill/.eslintrc.js

+0 −3
Original line number Diff line number Diff line
@@ -98,9 +98,6 @@ module.exports = { 
    // Disallow using the console API.

    "no-console": "error",



    // Disallow control characters in regular expressions.

    "no-control-regex": "error",



    // Disallow fallthrough of case statements, except if there is a comment.

    "no-fallthrough": "error",

devtools/client/responsivedesign/responsivedesign.jsm

+11 −0
Original line number Diff line number Diff line
@@ -363,7 +363,9 @@ ResponsiveUI.prototype = { 
    // Wait for resize message before stopping in the child when testing,

    // but only if we should expect to still get a message.

    if (flags.testing && this.tab.linkedBrowser.messageManager) {

      debug("CLOSE: WAIT ON CONTENT RESIZE");

      yield this.waitForMessage("ResponsiveMode:OnContentResize");

      debug("CLOSE: CONTENT RESIZE DONE");

    }



    if (this.isResizing) {
@@ -405,7 +407,9 @@ ResponsiveUI.prototype = { 
      this.touchEventSimulator.stop();

    }



    debug("CLOSE: WAIT ON CLIENT CLOSE");

    yield this.client.close();

    debug("CLOSE: CLIENT CLOSE DONE");

    this.client = this.emulationFront = null;



    this._telemetry.toolClosed("responsive");
@@ -413,11 +417,14 @@ ResponsiveUI.prototype = { 
    if (this.tab.linkedBrowser && this.tab.linkedBrowser.messageManager) {

      let stopped = this.waitForMessage("ResponsiveMode:Stop:Done");

      this.tab.linkedBrowser.messageManager.sendAsyncMessage("ResponsiveMode:Stop");

      debug("CLOSE: WAIT ON STOP");

      yield stopped;

      debug("CLOSE: STOP DONE");

    }



    this.hideNewUINotification();



    debug("CLOSE: DONE, EMIT OFF");

    this.inited = null;

    ResponsiveUIManager.emit("off", { tab: this.tab });

  }),
@@ -1129,6 +1136,10 @@ ResponsiveUI.prototype = { 
   */

  setViewportSize({ width, height }) {

    debug(`SET SIZE TO ${width} x ${height}`);

    if (this.closing) {

      debug(`ABORT SET SIZE, CLOSING`);

      return;

    }

    if (width) {

      this.setWidth(width);

    }