Skip to content

Commit 95226b7

Browse files
eddylu94trentmwillis
authored andcommitted
Correct tab order for toolbar filters
Resolve Issue #1428 Issue #1428: Tab order for "Module" and "Filter" items is reversed in toolbar
1 parent 254fccb commit 95226b7

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

reporter/html.js

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -502,13 +502,22 @@ export function escapeText( s ) {
502502
return moduleFilter;
503503
}
504504

505+
function toolbarFilters() {
506+
var toolbarFilters = document.createElement( "span" );
507+
508+
toolbarFilters.id = "qunit-toolbar-filters";
509+
toolbarFilters.appendChild( toolbarLooseFilter() );
510+
toolbarFilters.appendChild( toolbarModuleFilter() );
511+
512+
return toolbarFilters;
513+
}
514+
505515
function appendToolbar() {
506516
var toolbar = id( "qunit-testrunner-toolbar" );
507517

508518
if ( toolbar ) {
509519
toolbar.appendChild( toolbarUrlConfigContainer() );
510-
toolbar.appendChild( toolbarModuleFilter() );
511-
toolbar.appendChild( toolbarLooseFilter() );
520+
toolbar.appendChild( toolbarFilters() );
512521
toolbar.appendChild( document.createElement( "div" ) ).className = "clearfix";
513522
}
514523
}

src/qunit.css

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,10 @@
105105
height: 1.6em;
106106
}
107107

108+
#qunit-toolbar-filters {
109+
float: right;
110+
}
111+
108112
.qunit-url-config,
109113
.qunit-filter,
110114
#qunit-modulefilter {
@@ -114,7 +118,6 @@
114118

115119
.qunit-filter,
116120
#qunit-modulefilter {
117-
float: right;
118121
position: relative;
119122
margin-left: 1em;
120123
}

0 commit comments

Comments
 (0)