Merge m-c to fx-team.
authorRyan VanderMeulen <ryanvm@gmail.com>
Thu, 27 Feb 2014 17:47:23 -0500
changeset 171531 b03e0515efaf32651e5bace907aa30033c271c58
parent 171530 46ff4f074276035d8add88e6421c14d901623d6f (current diff)
parent 171447 d5bd7031fb3e6305a1a9035f9536818bc511acd8 (diff)
child 171532 2e3cdc99a6ffbb4ed240b7818b7320162e513f24
push id270
push userpvanderbeken@mozilla.com
push dateThu, 06 Mar 2014 09:24:21 +0000
milestone30.0a1
Merge m-c to fx-team.
browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js
--- a/browser/components/customizableui/content/panelUI.js
+++ b/browser/components/customizableui/content/panelUI.js
@@ -128,22 +128,16 @@ const PanelUI = {
     }
 
     this.ensureReady().then(() => {
       let editControlPlacement = CustomizableUI.getPlacementOfWidget("edit-controls");
       if (editControlPlacement && editControlPlacement.area == CustomizableUI.AREA_PANEL) {
         updateEditUIVisibility();
       }
 
-      let personalBookmarksPlacement = CustomizableUI.getPlacementOfWidget("personal-bookmarks");
-      if (personalBookmarksPlacement &&
-          personalBookmarksPlacement.area == CustomizableUI.AREA_PANEL) {
-        PlacesToolbarHelper.customizeChange();
-      }
-
       let anchor;
       if (!aEvent ||
           aEvent.type == "command") {
         anchor = this.menuButton;
       } else {
         anchor = aEvent.target;
       }
       let iconAnchor =
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -60,14 +60,13 @@ skip-if = os == "linux"
 [browser_942581_unregisterArea_keeps_placements.js]
 [browser_943683_migration_test.js]
 [browser_944887_destroyWidget_should_destroy_in_palette.js]
 [browser_945739_showInPrivateBrowsing_customize_mode.js]
 [browser_947987_removable_default.js]
 [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_972267_customizationchange_events.js]
 [browser_panel_toggle.js]
deleted file mode 100644
--- a/browser/components/customizableui/test/browser_968447_bookmarks_toolbar_items_in_panel.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/* 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();
-});