From 49ec75f62fd1c23af14f051fde53290703ffb183 Mon Sep 17 00:00:00 2001
From: Eddy Lu <eddy.lu@mail.mcgill.ca>
Date: Thu, 30 Jan 2020 23:49:14 -0800
Subject: [PATCH] Correct tab order for toolbar filters

Resolve Issue #1428
Issue #1428: Tab order for "Module" and "Filter" items is reversed in toolbar
---
 reporter/html.js | 13 +++++++++++--
 src/qunit.css    |  5 ++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/reporter/html.js b/reporter/html.js
index e61f1a63d..f9a2405c9 100644
--- a/reporter/html.js
+++ b/reporter/html.js
@@ -502,13 +502,22 @@ export function escapeText( s ) {
 		return moduleFilter;
 	}
 
+	function toolbarFilters() {
+		var toolbarFilters = document.createElement( "span" );
+
+		toolbarFilters.id = "qunit-toolbar-filters";
+		toolbarFilters.appendChild( toolbarLooseFilter() );
+		toolbarFilters.appendChild( toolbarModuleFilter() );
+
+		return toolbarFilters;
+	}
+
 	function appendToolbar() {
 		var toolbar = id( "qunit-testrunner-toolbar" );
 
 		if ( toolbar ) {
 			toolbar.appendChild( toolbarUrlConfigContainer() );
-			toolbar.appendChild( toolbarModuleFilter() );
-			toolbar.appendChild( toolbarLooseFilter() );
+			toolbar.appendChild( toolbarFilters() );
 			toolbar.appendChild( document.createElement( "div" ) ).className = "clearfix";
 		}
 	}
diff --git a/src/qunit.css b/src/qunit.css
index 21a92c8bd..27223b3b5 100644
--- a/src/qunit.css
+++ b/src/qunit.css
@@ -105,6 +105,10 @@
 	height: 1.6em;
 }
 
+#qunit-toolbar-filters {
+	float: right;
+}
+
 .qunit-url-config,
 .qunit-filter,
 #qunit-modulefilter {
@@ -114,7 +118,6 @@
 
 .qunit-filter,
 #qunit-modulefilter {
-	float: right;
 	position: relative;
 	margin-left: 1em;
 }