Backed out changeset 85d2c5b844bc (bug 989289) because we realized it'd break add-on toolbars, a=backout
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 09 Apr 2014 22:41:40 +0100
changeset 183693 1244d500650c
parent 183692 635f912b3164
child 183694 9c70e4856b3f
push id3449
push usergijskruitbosch@gmail.com
push date2014-04-09 21:42 +0000
treeherdermozilla-beta@1244d500650c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs989289
milestone29.0
backs out85d2c5b844bc
Backed out changeset 85d2c5b844bc (bug 989289) because we realized it'd break add-on toolbars, a=backout
browser/components/customizableui/content/toolbar.xml
browser/components/customizableui/test/browser.ini
browser/components/customizableui/test/browser_989289_force_icons_mode_attribute.js
--- a/browser/components/customizableui/content/toolbar.xml
+++ b/browser/components/customizableui/content/toolbar.xml
@@ -40,21 +40,16 @@
       ]]></constructor>
 
       <method name="_init">
         <body><![CDATA[
           let scope = {};
           Cu.import("resource:///modules/CustomizableUI.jsm", scope);
           let CustomizableUI = scope.CustomizableUI;
 
-          // Bug 989289: Forcibly set the now unsupported "mode" attribute, just
-          // in case it gets accidentally restored from persistence from a user
-          // that's been upgrading and downgrading.
-          this.setAttribute("mode", "icons");
-
           // Searching for the toolbox palette in the toolbar binding because
           // toolbars are constructed first.
           let toolbox = this.toolbox;
           if (toolbox && !toolbox.palette) {
             for (let node of toolbox.children) {
               if (node.localName == "toolbarpalette") {
                 // Hold on to the palette but remove it from the document.
                 toolbox.palette = node;
--- a/browser/components/customizableui/test/browser.ini
+++ b/browser/components/customizableui/test/browser.ini
@@ -84,10 +84,9 @@ skip-if = os == "linux"
 
 [browser_984455_bookmarks_items_reparenting.js]
 skip-if = os == "linux"
 
 [browser_985815_propagate_setToolbarVisibility.js]
 [browser_981305_separator_insertion.js]
 [browser_987177_destroyWidget_xul.js]
 [browser_987177_xul_wrapper_updating.js]
-[browser_989289_force_icons_mode_attribute.js]
 [browser_panel_toggle.js]
deleted file mode 100644
--- a/browser/components/customizableui/test/browser_989289_force_icons_mode_attribute.js
+++ /dev/null
@@ -1,31 +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";
-
-const kToolbarID = "test-toolbar";
-
-/**
- * Tests that customizable toolbars are forced to have their mode
- * attribute set to "icons".
- */
-add_task(function* testAddingToolbar() {
-  let toolbar = document.createElement("toolbar");
-  toolbar.setAttribute("mode", "full");
-  toolbar.setAttribute("customizable", "true");
-  toolbar.setAttribute("id", kToolbarID);
-
-  CustomizableUI.registerArea(kToolbarID, {
-     type: CustomizableUI.TYPE_TOOLBAR,
-     legacy: false,
-  })
-
-  gNavToolbox.appendChild(toolbar);
-
-  is(toolbar.getAttribute("mode"), "icons",
-     "Toolbar should have its mode attribute set to icons.")
-
-  toolbar.remove();
-  CustomizableUI.unregisterArea(kToolbarID);
-});
\ No newline at end of file