From bc57f2369992ff58d83e52e3002653c69a080ffb Mon Sep 17 00:00:00 2001
From: Markus Stefanko <markus.stefanko@gmail.com>
Date: Tue, 28 Apr 2020 10:27:10 +0700
Subject: [PATCH] Changelog for 5.1.6

---
 CHANGELOG.md         |  6 ++++++
 changelog.html       |  7 +++++++
 outlib/Session.js    |  8 ++++----
 outlib/TabManager.js | 20 ++++++++++++--------
 4 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ba91f15..3c8b44e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+5.1.6
+=====
+- Fix: Pressing "enter" or "return" when only one tab is selected, should focus that tab properly in Firefox
+- Reduce options that would be restored in sessions, to limit conflicts
+- Make inputs selectable in Firefox! You can now select text again in title, search and option inputs, etc. 
+
 5.1.5
 =====
 - Feature: Changing the name of a window will set change the windows' title in Firefox as well
diff --git a/changelog.html b/changelog.html
index e2761c30..60af5286 100644
--- a/changelog.html
+++ b/changelog.html
@@ -35,6 +35,13 @@ <h3>Here's what's planned for future versions</h3>
                <h3>Here's what's new since the last time</h3>
                <div class="toggle-box">
 
+<h3>5.1.6</h3>
+<ul>
+<li>Fix: Pressing "enter" or "return" when only one tab is selected, should focus that tab properly in Firefox</li>
+<li>Reduce options that would be restored in sessions, to limit conflicts</li>
+<li>Make inputs selectable in Firefox! You can now select text again in title, search and option inputs, etc. </li>
+</ul>
+
 <h3>5.1.5</h3>
 <ul>
 <li>Feature: Changing the name of a window will set change the windows' title in Firefox as well</li>
diff --git a/outlib/Session.js b/outlib/Session.js
index 5697f24c..26c246fe 100644
--- a/outlib/Session.js
+++ b/outlib/Session.js
@@ -142,16 +142,16 @@ Session = function (_React$Component) {_inherits(Session, _React$Component);
 									customName = this.props.window.name;
 								}
 
-								whitelistWindow = ["url", "tabId", "left", "top", "width", "height", "focused", "incognito", "type", "setSelfAsOpener"];
+								whitelistWindow = ["left", "top", "width", "height", "incognito", "type"];
 
 								if (navigator.userAgent.search("Firefox") > -1) {
-									whitelistWindow = ["url", "tabId", "left", "top", "width", "height", "incognito", "type", "setSelfAsOpener"];
+									whitelistWindow = ["left", "top", "width", "height", "incognito", "type"];
 								}
 
-								whitelistTab = ["windowId", "index", "url", "active", "selected", "pinned"];
+								whitelistTab = ["url", "active", "selected", "pinned"];
 
 								if (navigator.userAgent.search("Firefox") > -1) {
-									whitelistTab = ["windowId", "index", "url", "active", "pinned"];
+									whitelistTab = ["url", "active", "pinned"];
 								}
 
 								filteredWindow = Object.keys(this.props.window.windowsInfo).
diff --git a/outlib/TabManager.js b/outlib/TabManager.js
index 6efd405a..2c859e80 100644
--- a/outlib/TabManager.js
+++ b/outlib/TabManager.js
@@ -663,16 +663,20 @@ TabManager = function (_React$Component) {_inherits(TabManager, _React$Component
 									return _this3.state.tabsbyid[id];
 								});if (!(
 
-								count == 0)) {_context5.next = 7;break;}
-								browser.windows.create({});_context5.next = 18;break;case 7:if (!(
-								count == 1)) {_context5.next = 14;break;}_context5.next = 10;return (
-									browser.runtime.getBackgroundPage());case 10:backgroundPage = _context5.sent;
-								backgroundPage.focusOnTabAndWindow(tabs[0]);_context5.next = 18;break;case 14:_context5.next = 16;return (
+								count == 0)) {_context5.next = 8;break;}_context5.next = 6;return (
+									browser.windows.create({}));case 6:_context5.next = 19;break;case 8:if (!(
+								count == 1)) {_context5.next = 15;break;}_context5.next = 11;return (
+									browser.runtime.getBackgroundPage());case 11:backgroundPage = _context5.sent;
+								if (navigator.userAgent.search("Firefox") > -1) {
+									backgroundPage.focusOnTabAndWindowDelayed(tabs[0]);
+								} else {
+									backgroundPage.focusOnTabAndWindow(tabs[0]);
+								}_context5.next = 19;break;case 15:_context5.next = 17;return (
 
-									browser.runtime.getBackgroundPage());case 16:backgroundPage = _context5.sent;
-								backgroundPage.createWindowWithTabs(tabs);case 18:
+									browser.runtime.getBackgroundPage());case 17:backgroundPage = _context5.sent;
+								backgroundPage.createWindowWithTabs(tabs);case 19:
 
-								if (!!window.inPopup) window.close();case 19:case "end":return _context5.stop();}}}, _callee5, this);}));function addWindow() {return _ref5.apply(this, arguments);}return addWindow;}() }, { key: "pinTabs", value: function () {var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {var _this4, tabs, i, t;return regeneratorRuntime.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
+								if (!!window.inPopup) window.close();case 20:case "end":return _context5.stop();}}}, _callee5, this);}));function addWindow() {return _ref5.apply(this, arguments);}return addWindow;}() }, { key: "pinTabs", value: function () {var _ref6 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee6() {var _this4, tabs, i, t;return regeneratorRuntime.wrap(function _callee6$(_context6) {while (1) {switch (_context6.prev = _context6.next) {case 0:
 
 
 								_this4 = this;