From 0709a30e712ac20a6b06b246b5db7db0dc400eb2 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Fri, 5 Jul 2019 17:32:17 +0800
Subject: [PATCH 1/2] Issue #1158 - Remove extraneous closing brace - This also
 adjusts code indentation

---
 .../basilisk/base/content/tabbrowser.xml      | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/application/basilisk/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index 8f98a5af0f..a95e8495f3 100644
--- a/application/basilisk/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
@@ -6925,21 +6925,20 @@
     <handlers>
       <handler event="popupshowing">
       <![CDATA[
-          document.getElementById("alltabs_undoCloseTab").disabled =
-            SessionStore.getClosedTabCount(window) == 0;
+        document.getElementById("alltabs_undoCloseTab").disabled =
+          SessionStore.getClosedTabCount(window) == 0;
 
-          // Listen for changes in the tab bar.
-          tabcontainer.addEventListener("TabAttrModified", this, false);
-          tabcontainer.addEventListener("TabClose", this, false);
-          tabcontainer.mTabstrip.addEventListener("scroll", this, false);
+        // Listen for changes in the tab bar.
+        tabcontainer.addEventListener("TabAttrModified", this, false);
+        tabcontainer.addEventListener("TabClose", this, false);
+        tabcontainer.mTabstrip.addEventListener("scroll", this, false);
 
-          let tabs = gBrowser.visibleTabs;
-          for (var i = 0; i < tabs.length; i++) {
-            if (!tabs[i].pinned)
-              this._createTabMenuItem(tabs[i]);
-          }
-          this._updateTabsVisibilityStatus();
+        let tabs = gBrowser.visibleTabs;
+        for (var i = 0; i < tabs.length; i++) {
+          if (!tabs[i].pinned)
+            this._createTabMenuItem(tabs[i]);
         }
+        this._updateTabsVisibilityStatus();
       ]]></handler>
 
       <handler event="popuphidden">

From 41758fcea8235ea592e5e29c7cbad8343e084089 Mon Sep 17 00:00:00 2001
From: FranklinDM <mrmineshafter17@gmail.com>
Date: Fri, 5 Jul 2019 17:50:00 +0800
Subject: [PATCH 2/2] Issue #1158 - Reinstate `tabcontainer` variable - This
 was erroneously removed in commit 1f5194b5f1deb0f36b36ed886d94ce5f8b62ca9d
 because it is still being used by surrounding code.

---
 application/basilisk/base/content/tabbrowser.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/basilisk/base/content/tabbrowser.xml b/application/basilisk/base/content/tabbrowser.xml
index a95e8495f3..b0958370be 100644
--- a/application/basilisk/base/content/tabbrowser.xml
+++ b/application/basilisk/base/content/tabbrowser.xml
@@ -6928,6 +6928,8 @@
         document.getElementById("alltabs_undoCloseTab").disabled =
           SessionStore.getClosedTabCount(window) == 0;
 
+        var tabcontainer = gBrowser.tabContainer;
+
         // Listen for changes in the tab bar.
         tabcontainer.addEventListener("TabAttrModified", this, false);
         tabcontainer.addEventListener("TabClose", this, false);