Commit cf611bec authored by Carsten "Tomcat" Book's avatar Carsten "Tomcat" Book
Browse files

merge mozilla-inboudn to mozilla-central a=merge

parents 99002c6d 2b78b146

accessible/generic/DocAccessible.cpp

+5 −0
Original line number Diff line number Diff line
@@ -764,6 +764,11 @@ DocAccessible::AttributeChanged(nsIDocument* aDocument, 
    accessible = this;

  }



  if (!accessible->IsBoundToParent()) {

    MOZ_ASSERT_UNREACHABLE("DOM attribute change on accessible detached from tree");

    return;

  }



  // Fire accessible events iff there's an accessible, otherwise we consider

  // the accessible state wasn't changed, i.e. its state is initial state.

  AttributeChangedImpl(accessible, aNameSpaceID, aAttribute);

browser/base/content/browser-social.js

+3 −3
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ SocialUI = { 
      }

    }

    // update the disabled state of the button based on the command

    for (let node of SocialMarks.nodes) {

    for (let node of SocialMarks.nodes()) {

      if (canShare) {

        node.removeAttribute("disabled")

      } else {
@@ -1300,7 +1300,7 @@ var SocialMarksWidgetListener = { 
 * Handles updates to toolbox and signals all buttons to update when necessary.

 */

SocialMarks = {

  get nodes() {

  *nodes() {

    for (let p of Social.providers.filter(p => p.markURL)) {

      let widgetId = SocialMarks._toolbarHelper.idFromOrigin(p.origin);

      let widget = CustomizableUI.getWidget(widgetId);
@@ -1314,7 +1314,7 @@ SocialMarks = { 
  update: function() {

    // querySelectorAll does not work on the menu panel, so we have to do this

    // the hard way.

    for (let node of this.nodes) {

    for (let node of this.nodes()) {

      // xbl binding is not complete on startup when buttons are not in toolbar,

      // verify update is available

      if (node.update) {

browser/base/content/browser.js

+5 −1
Original line number Diff line number Diff line
@@ -7594,8 +7594,12 @@ var TabContextMenu = { 


    if (AppConstants.E10S_TESTING_ONLY) {

      menuItems = aPopupMenu.getElementsByAttribute("tbattr", "tabbrowser-remote");

      for (let menuItem of menuItems)

      for (let menuItem of menuItems) {

        menuItem.hidden = !gMultiProcessBrowser;

        if (menuItem.id == "context_openNonRemoteWindow") {

          menuItem.disabled = !!parseInt(this.contextTab.getAttribute("usercontextid"));

        }

      }

    }



    disabled = gBrowser.visibleTabs.length == 1;

browser/base/content/test/general/browser_contextmenu.js

+2 −2
Original line number Diff line number Diff line
@@ -882,7 +882,7 @@ add_task(function* test_plaintext_sendpagetodevice() { 
                    "context-viewinfo",     true

                   ];

  yield test_contextmenu("#test-text", plainTextItems, {

      onContextMenuShown() {

      *onContextMenuShown() {

        yield openMenuItemSubmenu("context-sendpagetodevice");

      }

    });
@@ -918,7 +918,7 @@ add_task(function* test_link_sendlinktodevice() { 
       "*All Devices", true], null,

    ],

    {

      onContextMenuShown() {

      *onContextMenuShown() {

        yield openMenuItemSubmenu("context-sendlinktodevice");

      }

    });

browser/components/extensions/.eslintrc

+1 −1
Original line number Diff line number Diff line
@@ -5,9 +5,9 @@ 
    "AllWindowEvents": true,

    "currentWindow": true,

    "EventEmitter": true,

    "IconDetails": true,

    "makeWidgetId": true,

    "pageActionFor": true,

    "IconDetails": true,

    "PanelPopup": true,

    "TabContext": true,

    "ViewPopup": true,