@@ -72,6 +72,7 @@ describe('markdown-toolbar-element', function() {
7272 <md-header>header</md-header>
7373 <md-header level="1">h1</md-header>
7474 <md-header level="10">h1</md-header>
75+ <div data-md-button>Other button</div>
7576 <md-italic>italic</md-italic>
7677 <md-quote>quote</md-quote>
7778 <md-code>code</md-code>
@@ -112,50 +113,62 @@ describe('markdown-toolbar-element', function() {
112113 it ( 'moves focus to next button when ArrowRight is pressed' , function ( ) {
113114 focusFirstButton ( )
114115 pushKeyOnFocussedButton ( 'ArrowRight' )
115- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
116+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
116117 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header' ) ] )
117118 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
118119 pushKeyOnFocussedButton ( 'ArrowRight' )
119- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
120+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
120121 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header[level="1"]' ) ] )
121122 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
122123 pushKeyOnFocussedButton ( 'ArrowRight' )
123- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
124+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
124125 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header[level="10"]' ) ] )
125126 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
126127 } )
127128
128129 it ( 'cycles focus round to last element from first when ArrowLeft is pressed' , function ( ) {
129130 focusFirstButton ( )
130131 pushKeyOnFocussedButton ( 'ArrowLeft' )
131- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
132+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
132133 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
133134 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
134135 pushKeyOnFocussedButton ( 'ArrowLeft' )
135- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
136+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
136137 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-mention' ) ] )
137138 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
138139 } )
139140
140141 it ( 'focussed first/last button when Home/End key is pressed' , function ( ) {
141142 focusFirstButton ( )
142143 pushKeyOnFocussedButton ( 'End' )
143- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
144+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
144145 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
145146 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
146147 pushKeyOnFocussedButton ( 'End' )
147- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
148+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
148149 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
149150 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
150151 pushKeyOnFocussedButton ( 'Home' )
151- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
152+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
152153 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-bold' ) ] )
153154 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
154155 pushKeyOnFocussedButton ( 'Home' )
155- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
156+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
156157 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-bold' ) ] )
157158 assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
158159 } )
160+
161+ it ( 'counts `data-md-button` elements in the focussable set' , function ( ) {
162+ focusFirstButton ( )
163+ pushKeyOnFocussedButton ( 'ArrowRight' )
164+ pushKeyOnFocussedButton ( 'ArrowRight' )
165+ pushKeyOnFocussedButton ( 'ArrowRight' )
166+ pushKeyOnFocussedButton ( 'ArrowRight' )
167+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
168+ console . log ( getElementsWithTabindex ( 0 ) )
169+ assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'div[data-md-button]' ) ] )
170+ assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
171+ } )
159172 } )
160173
161174 describe ( 'bold' , function ( ) {
0 commit comments