@@ -72,6 +72,7 @@ describe('markdown-toolbar-element', function() {
72
72
<md-header>header</md-header>
73
73
<md-header level="1">h1</md-header>
74
74
<md-header level="10">h1</md-header>
75
+ <div data-md-button>Other button</div>
75
76
<md-italic>italic</md-italic>
76
77
<md-quote>quote</md-quote>
77
78
<md-code>code</md-code>
@@ -112,50 +113,62 @@ describe('markdown-toolbar-element', function() {
112
113
it ( 'moves focus to next button when ArrowRight is pressed' , function ( ) {
113
114
focusFirstButton ( )
114
115
pushKeyOnFocussedButton ( 'ArrowRight' )
115
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
116
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
116
117
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header' ) ] )
117
118
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
118
119
pushKeyOnFocussedButton ( 'ArrowRight' )
119
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
120
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
120
121
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header[level="1"]' ) ] )
121
122
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
122
123
pushKeyOnFocussedButton ( 'ArrowRight' )
123
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
124
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
124
125
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-header[level="10"]' ) ] )
125
126
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
126
127
} )
127
128
128
129
it ( 'cycles focus round to last element from first when ArrowLeft is pressed' , function ( ) {
129
130
focusFirstButton ( )
130
131
pushKeyOnFocussedButton ( 'ArrowLeft' )
131
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
132
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
132
133
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
133
134
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
134
135
pushKeyOnFocussedButton ( 'ArrowLeft' )
135
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
136
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
136
137
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-mention' ) ] )
137
138
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
138
139
} )
139
140
140
141
it ( 'focussed first/last button when Home/End key is pressed' , function ( ) {
141
142
focusFirstButton ( )
142
143
pushKeyOnFocussedButton ( 'End' )
143
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
144
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
144
145
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
145
146
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
146
147
pushKeyOnFocussedButton ( 'End' )
147
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
148
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
148
149
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-ref' ) ] )
149
150
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
150
151
pushKeyOnFocussedButton ( 'Home' )
151
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
152
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
152
153
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-bold' ) ] )
153
154
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
154
155
pushKeyOnFocussedButton ( 'Home' )
155
- assert . equal ( getElementsWithTabindex ( - 1 ) . length , 13 )
156
+ assert . equal ( getElementsWithTabindex ( - 1 ) . length , 14 )
156
157
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . querySelector ( 'md-bold' ) ] )
157
158
assert . deepEqual ( getElementsWithTabindex ( 0 ) , [ document . activeElement ] )
158
159
} )
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
+ } )
159
172
} )
160
173
161
174
describe ( 'bold' , function ( ) {
0 commit comments