From 990cd338d89ce7121d01a0cd78d016ad8d5f829c Mon Sep 17 00:00:00 2001
From: Jennifer Fong <jfong@mozilla.com>
Date: Wed, 26 Aug 2015 10:18:00 -0400
Subject: [PATCH] Bug 1198830 - Disable toolboxfullscreen if sidebars are
 enabled. r=jryans

---
 browser/devtools/webide/content/webide.js                     | 4 ++++
 .../devtools/webide/test/sidebars/test_fullscreenToolbox.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/browser/devtools/webide/content/webide.js b/browser/devtools/webide/content/webide.js
index 9e387640a4b9..1427684e203b 100644
--- a/browser/devtools/webide/content/webide.js
+++ b/browser/devtools/webide/content/webide.js
@@ -1056,6 +1056,10 @@ let UI = {
   },
 
   updateToolboxFullscreenState: function() {
+    if (projectList.sidebarsEnabled) {
+      return;
+    }
+
     let panel = document.querySelector("#deck").selectedPanel;
     let nbox = document.querySelector("#notificationbox");
     if (panel && panel.id == "deck-panel-details" &&
diff --git a/browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html b/browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html
index 7c1936af636d..2bbc85b331ae 100644
--- a/browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html
+++ b/browser/devtools/webide/test/sidebars/test_fullscreenToolbox.html
@@ -51,7 +51,7 @@
           ok(win.UI.toolboxIframe, "Toolbox iframe exists");
 
           let nbox = win.document.querySelector("#notificationbox");
-          ok(nbox.hasAttribute("toolboxfullscreen"), "Toolbox is fullsreen");
+          ok(!nbox.hasAttribute("toolboxfullscreen"), "Toolbox is not fullscreen");
 
           win.Cmds.showRuntimeDetails();