From e6e1bdda64da19999fe5a4e5284a681490a0bc0c Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Tue, 11 Mar 2014 19:56:55 +0000 Subject: [PATCH] Backed out changeset f66e3ccb0c41 and fdebf60103c3 (bug 981418) --- .../customizableui/content/panelUI.xml | 11 +-- .../customizableui/src/CustomizableUI.jsm | 16 ++-- .../customizableui/test/browser.ini | 1 - ...r_981418-widget-onbeforecreated-handler.js | 90 ------------------- 4 files changed, 7 insertions(+), 111 deletions(-) delete mode 100644 browser/components/customizableui/test/browser_981418-widget-onbeforecreated-handler.js diff --git a/browser/components/customizableui/content/panelUI.xml b/browser/components/customizableui/content/panelUI.xml index 113da5dcaf1e..a813c71ef4dc 100644 --- a/browser/components/customizableui/content/panelUI.xml +++ b/browser/components/customizableui/content/panelUI.xml @@ -325,10 +325,7 @@ viewShownDeferred.reject("Panel not shown within 20s"), 20000); - yield viewShownDeferred.promise; - clearTimeout(shownTimeout); - ok(true, "Found view shown"); - - let tempPanel = document.getElementById("customizationui-widget-panel"); - let panelHiddenPromise = promisePanelElementHidden(window, tempPanel); - tempPanel.hidePopup(); - yield panelHiddenPromise; - - CustomizableUI.addWidgetToArea(kWidgetId, CustomizableUI.AREA_PANEL); - yield PanelUI.show(); - - viewShownDeferred = Promise.defer(); - widgetNode.click(); - - shownTimeout = setTimeout(() => viewShownDeferred.reject("Panel not shown within 20s"), 20000); - yield viewShownDeferred.promise; - clearTimeout(shownTimeout); - ok(true, "Found view shown"); - - let panelHidden = promisePanelHidden(window); - PanelUI.hide(); - yield panelHidden; - } catch (ex) { - ok(false, "Unexpected exception (like a timeout for one of the yields) " + - "when testing view widget."); - } - } - - noError = true; - try { - CustomizableUI.destroyWidget(kWidgetId); - } catch (ex) { - Cu.reportError(ex); - noError = false; - } - ok(noError, "Should not throw an exception trying to remove the broken view widget."); -}); - -add_task(function asyncCleanup() { - yield resetCustomization(); -});