From f1fa076f62e99089257f6f8159cb2ce503f0abc2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Scott=20Gonz=C3=A1lez?= <scott.gonzalez@gmail.com>
Date: Wed, 12 Oct 2016 12:21:01 -0400
Subject: [PATCH] Tabs: Don't blur focused tab on sort

Fixes #14627
Closes gh-1761
---
 demos/tabs/sortable.html | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/demos/tabs/sortable.html b/demos/tabs/sortable.html
index 051663ed4..9888cff77 100644
--- a/demos/tabs/sortable.html
+++ b/demos/tabs/sortable.html
@@ -9,10 +9,21 @@
 	<script src="../../external/requirejs/require.js"></script>
 	<script src="../bootstrap.js" data-modules="sortable">
 		var tabs = $( "#tabs" ).tabs();
+		var previouslyFocused = false;
+
 		tabs.find( ".ui-tabs-nav" ).sortable({
 			axis: "x",
-			stop: function() {
+
+			// Sortable removes focus, so we need to restore it if the tab was focused
+			// prior to sorting
+			start: function(event, ui) {
+				previouslyFocused = document.activeElement === ui.item[ 0 ];
+			},
+			stop: function(event, ui) {
 				tabs.tabs( "refresh" );
+				if (previouslyFocused) {
+					ui.item.focus();
+				}
 			}
 		});
 	</script>
-- 
2.39.5