Commit 15836c44 authored by Ryan VanderMeulen's avatar Ryan VanderMeulen
Browse files

Backed out changeset c10115ce8c0d (bug 968447) for linux32 debug mochitest-bc perma-fail.

parent c2a4879d

browser/components/customizableui/content/panelUI.js

+0 −6
Original line number Diff line number Diff line
@@ -133,12 +133,6 @@ const PanelUI = { 
        updateEditUIVisibility();

      }



      let personalBookmarksPlacement = CustomizableUI.getPlacementOfWidget("personal-bookmarks");

      if (personalBookmarksPlacement &&

          personalBookmarksPlacement.area == CustomizableUI.AREA_PANEL) {

        PlacesToolbarHelper.customizeChange();

      }



      let anchor;

      if (!aEvent ||

          aEvent.type == "command") {

browser/components/customizableui/test/browser.ini

+0 −1
Original line number Diff line number Diff line
@@ -65,7 +65,6 @@ skip-if = os == "linux" 
[browser_948985_non_removable_defaultArea.js]

[browser_952963_areaType_getter_no_area.js]

[browser_956602_remove_special_widget.js]

[browser_968447_bookmarks_toolbar_items_in_panel.js]

[browser_969427_recreate_destroyed_widget_after_reset.js]

[browser_969661_character_encoding_navbar_disabled.js]

[browser_970511_undo_restore_default.js]

browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js

deleted100644 → 0
+0 −32
Original line number Diff line number Diff line 
/* This Source Code Form is subject to the terms of the Mozilla Public

 * License, v. 2.0. If a copy of the MPL was not distributed with this

 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */



"use strict";



// Bug 968447 - The Bookmarks Toolbar Items doesn't appear as a

// normal menu panel button in new windows.

add_task(function() {

  const buttonId = "bookmarks-toolbar-placeholder";

  yield startCustomizing();

  CustomizableUI.addWidgetToArea("personal-bookmarks", CustomizableUI.AREA_PANEL);

  yield endCustomizing();

  yield PanelUI.show();

  let bookmarksToolbarPlaceholder = document.getElementById(buttonId);

  ok(bookmarksToolbarPlaceholder.classList.contains("toolbarbutton-1"),

     "Button should have toolbarbutton-1 class");

  is(bookmarksToolbarPlaceholder.getAttribute("wrap"), "true",

     "Button should have the 'wrap' attribute");

  yield PanelUI.hide();



  let newWin = yield openAndLoadWindow();

  yield newWin.PanelUI.show();

  let newWinBookmarksToolbarPlaceholder = newWin.document.getElementById(buttonId);

  ok(newWinBookmarksToolbarPlaceholder.classList.contains("toolbarbutton-1"),

     "Button in new window should have toolbarbutton-1 class");

  is(newWinBookmarksToolbarPlaceholder.getAttribute("wrap"), "true",

     "Button in new window should have 'wrap' attribute");

  yield newWin.PanelUI.hide();

  newWin.close();

  CustomizableUI.reset();

});