From 891357733c6acb6bf50356517fb1a21ab8f59330 Mon Sep 17 00:00:00 2001
From: Infocatcher <infocatcher.dev.null@gmail.com>
Date: Tue, 27 Dec 2016 22:49:16 +0300
Subject: [PATCH] Workaround to toggle tab private state in Firefox 51+ Now
 will be used duplicated tab (#237)

---
 bootstrap.js | 40 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 37 insertions(+), 3 deletions(-)

diff --git a/bootstrap.js b/bootstrap.js
index 873041e..0b4b557 100644
--- a/bootstrap.js
+++ b/bootstrap.js
@@ -2502,10 +2502,15 @@ var privateTab = {
 		return contextTab || cm && cm.triggerNode && window.gBrowser.mContextTab;
 	},
 	toggleContextTabPrivate: function(window, toggleReload) {
+		var gBrowser = window.gBrowser;
 		var tab = this.getContextTab(window, true)
-			|| window.gBrowser.selectedTab; // For hotkey
-		var isPrivate = this.toggleTabPrivate(tab);
-		if(this.isPendingTab(tab)) {
+			|| gBrowser.selectedTab; // For hotkey
+		// Unable to toggle in Firefox 51+, see https://bugzilla.mozilla.org/show_bug.cgi?id=1318388#c39
+		var useDupTab = this.platformVersion >= 51;
+		var isPrivate = useDupTab
+			? !this.isPrivateTab(tab) // Just get state
+			: this.toggleTabPrivate(tab);
+		if(!useDupTab && this.isPendingTab(tab)) {
 			_log("toggleContextTabPrivate() -> isPendingTab -> fixTabState()");
 			this.fixTabState(tab, isPrivate);
 		}
@@ -2514,6 +2519,35 @@ var privateTab = {
 			var stopLoading = prefs.get("toggleTabPrivateAutoReload.stopLoading");
 			if(toggleReload)
 				autoReload = !autoReload;
+
+			if(useDupTab) {
+				_log("toggleContextTabPrivate() -> will use gBrowser.duplicateTab()");
+				var pos = "_tPos" in tab
+					? tab._tPos
+					: Array.prototype.indexOf.call(gBrowser.tabs, tab); // SeaMonkey
+				// Set private attribute before our global "SSTabRestoring" listener
+				var onRestore;
+				window.addEventListener("SSTabRestoring", onRestore = function(e) {
+					window.removeEventListener(e.type, onRestore, true);
+					_log("toggleContextTabPrivate() => " + e.type + " => update private attribute");
+					var tab = e.originalTarget || e.target;
+					if(isPrivate)
+						tab.setAttribute(this.privateAttr, "true");
+					else
+						tab.removeAttribute(this.privateAttr);
+				}.bind(this), true);
+				var dupTab = gBrowser.duplicateTab(tab);
+				gBrowser.moveTabTo(dupTab, pos);
+				if(tab.selected)
+					gBrowser.selectedTab = dupTab;
+				window.setTimeout(function(tab) {
+					gBrowser.removeTab(tab);
+				}, 0, tab);
+				tab = dupTab;
+				// Duplicated tab will be reloaded anyway
+				autoReload = stopLoading = false;
+			}
+
 			var browser = tab.linkedBrowser;
 			if(autoReload) {
 				var typed = browser.userTypedValue;